fingerprint 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ad0fb2f50f482dc7dc06185001d5eefd60ea136069d0e0c2004eaefdba4351
-  data.tar.gz: a0256e102d7628d5410fa94bb9f23b8f0858155a10d4dbef108097b76129ec78
+  metadata.gz: fe183e59d36938796040005023943811697ab7c5f4d18c78f4740dd21bdcacb5
+  data.tar.gz: a781c31d0eb206bf505ca521331e13681b43014a15260c7a6aeb6cf7056796c0
 SHA512:
-  metadata.gz: d0aff09d12a3c2f5c683433aa1e6ed0f9f2a8d77be668cdd1aac6d20899821d091f1edce2be721bc5889b12cfe69bfd1248fed6e275ab6a941c7da6b416d2457
-  data.tar.gz: 1ac6617e297ed4395fb05fd8cb6e785f98b9f298b0b1326235b034d450c78858cdbcab7370b781150c8acc06ff6cb7df444703632321374d426a02dfaf0f14c7
+  metadata.gz: 9fea4f8529180e152013a160c8e87f7deb046cd7270a2f9b4206ecb9ff84454f6fccedd93b98488cfc79baf9b33c9dcd863ce7fd586cd12da29d56203f59c31a
+  data.tar.gz: db95df8fbbf8b5d67a0bfe68d3953d8066c549d055c772d15705f3b54e2bf7c2f555e854335694da3ec27347e0c1d50835a3c0871b16656ca229eff70232b479

data/lib/fingerprint/checker.rb

@@ -98,17 +98,10 @@ module Fingerprint
 		def self.check_files(master, copy, **options, &block)
 			# New API that takes two RecordSets...
 			
-			File.open(master) do |master_file|
-				File.open(copy) do |copy_file|
-					master_recordset = RecordSet.new
-					master_recordset.parse(master_file)
-					
-					copy_recordset = RecordSet.new
-					copy_recordset.parse(copy_file)
-
-					verify(master_recordset, copy_recordset, **options, &block)
-				end
-			end
+			master_recordset = RecordSet.load_file(master)
+			copy_recordset = RecordSet.load_file(copy)
+			
+			verify(master_recordset, copy_recordset, **options, &block)
 		end
 
 		# Helper function to check two fingerprint files.

data/lib/fingerprint/command/duplicates.rb

@@ -33,6 +33,8 @@ module Fingerprint
 				option "-i/--inverse", "Invert the output, i.e. show files which are not duplicates."
 				option "-x/--extended", "Include extended information about files and directories."
 				
+				option "--delete", "Delete duplicates."
+				
 				option "--verbose", "Verbose output, e.g. what is happening."
 			end
 			
@@ -41,56 +43,57 @@ module Fingerprint
 			
 			attr :duplicates_recordset
 			
+			def delete(path)
+				FileUtils.rm_f(path)
+			end
+			
 			def call
 				@duplicates_recordset = RecordSet.new
 				results = RecordSetPrinter.new(@duplicates_recordset, @parent.output)
 				
 				master_file_path = @master
-				File.open(master_file_path) do |master_file|
-					master_recordset = RecordSet.new
-					master_recordset.parse(master_file)
+				master_recordset = RecordSet.load_file(master_file_path)
 					
-					ignore_similar = false
-					
-					copy_file_paths = @copies
-					
-					if copy_file_paths.size == 0
-						copy_file_paths = [master_file_path]
-						ignore_similar = true
-					end
+				ignore_similar = false
+				
+				copy_file_paths = @copies
+				
+				if copy_file_paths.size == 0
+					copy_file_paths = [master_file_path]
+					ignore_similar = true
+				end
+				
+				copy_file_paths.each do |copy_file_path|
+					copy_recordset = RecordSet.load_file(copy_file_path)
 					
-					copy_file_paths.each do |copy_file_path|
-						File.open(copy_file_path) do |copy_file|
-							copy_recordset = RecordSet.new
-							copy_recordset.parse(copy_file)
+					copy_recordset.records.each do |record|
+						next unless record.file?
+						
+						record.metadata['fingerprint'] = copy_file_path
+						
+						# We need to see if the record exists in the master
+						
+						if @options[:verbose]
+							$stderr.puts "Checking #{record.inspect}"
+						end
+						
+						main_record = master_recordset.find_by_key(record)
+						
+						# If we are scanning the same index, don't print out every file, just those that are duplicates within the single file.
+						if ignore_similar && main_record && (main_record.path == record.path)
+							main_record = nil
+						end
+						
+						if main_record
+							record.metadata['original.path'] = main_record.path
+							record.metadata['original.fingerprint'] = master_file_path
+							results << record if !@options[:inverse]
 							
-							copy_recordset.records.each do |record|
-								next unless record.file?
-								
-								record.metadata['fingerprint'] = copy_file_path
-								record.metadata['full_path'] = copy_recordset.full_path(record.path)
-								
-								# We need to see if the record exists in the master
-								
-								if @options[:verbose]
-									$stderr.puts "Checking #{record.inspect}"
-								end
-								
-								main_record = master_recordset.find_by_key(record)
-								
-								# If we are scanning the same index, don't print out every file, just those that are duplicates within the single file.
-								if ignore_similar && main_record && (main_record.path == record.path)
-									main_record = nil
-								end
-								
-								if main_record
-									record.metadata['original.path'] = main_record.path
-									record.metadata['original.fingerprint'] = master_file_path
-									results << record if !@options[:inverse]
-								else
-									results << record if @options[:inverse]
-								end
+							if @options[:delete]
+								delete(copy_recordset.full_path(record.path))
 							end
+						else
+							results << record if @options[:inverse]
 						end
 					end
 				end

data/lib/fingerprint/command/verify.rb

@@ -60,11 +60,7 @@ module Fingerprint
 				options = @options.dup
 				options[:output] = @parent.output
 
-				master = RecordSet.new
-
-				File.open(input_file, "r") do |io|
-					master.parse(io)
-				end
+				master = RecordSet.load_file(input_file)
 
 				if master.configuration
 					options.merge!(master.configuration.options)

data/lib/fingerprint/record.rb

@@ -90,13 +90,16 @@ module Fingerprint
 	
 	class RecordSet
 		def self.load_file(path)
+			path = File.expand_path(path)
+			root = File.dirname(path)
+			
+			record_set = self.new(root)
+			
 			File.open(path, "r") do |io|
-				self.load(io)
+				record_set.parse(io)
 			end
-		end
-		
-		def self.load(io)
-			self.new.tap{|record_set| record_set.parse(io)}
+			
+			return record_set
 		end
 		
 		def initialize(root = nil)
@@ -131,7 +134,7 @@ module Fingerprint
 				end
 				
 				@configuration = record
-				@root = @configuration.path
+				@root ||= @configuration.path
 			else
 				@paths[record.path] = record
 				
@@ -239,7 +242,7 @@ module Fingerprint
 				elsif line.match(/^\s+([a-zA-Z\.0-9]+)\s+(.*)$/)
 					metadata[$1] = $2
 				else
-					$stderr.puts "Unhandled line: #{line}"
+					raise "Unhandled line: #{line}"
 				end
 			end
 

data/lib/fingerprint/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Fingerprint
-	VERSION = "3.3.0"
+	VERSION = "3.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fingerprint
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Samuel Williams