fingerprint 3.1.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e4286765727a4efa88c5ecf4f84ab5d736606a0adae710c32073da69746465
-  data.tar.gz: be66585855747916dd4294736a68cc04d2ff3e1aa49df83d08ec98b4e21bcfee
+  metadata.gz: fe183e59d36938796040005023943811697ab7c5f4d18c78f4740dd21bdcacb5
+  data.tar.gz: a781c31d0eb206bf505ca521331e13681b43014a15260c7a6aeb6cf7056796c0
 SHA512:
-  metadata.gz: 8772554e075f2b29016fe859c85d0d7082fc66a77f068b02d33ebc084c15efa20a83baa52d48fad3860b18316d2084f515f28933065fd7f0a7f7c9743c27bd39
-  data.tar.gz: 8757e6f7cc91db4a7f80be3485ac61184ed0c8fa9ecaad58f2ba257ff74a2b6d7384888439263d7faafa99d4238712b96ab11ba7e6585d4fe43968a8a6fd7672
+  metadata.gz: 9fea4f8529180e152013a160c8e87f7deb046cd7270a2f9b4206ecb9ff84454f6fccedd93b98488cfc79baf9b33c9dcd863ce7fd586cd12da29d56203f59c31a
+  data.tar.gz: db95df8fbbf8b5d67a0bfe68d3953d8066c549d055c772d15705f3b54e2bf7c2f555e854335694da3ec27347e0c1d50835a3c0871b16656ca229eff70232b479

data/lib/fingerprint/checker.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'fingerprint/record'
+require_relative 'record'
 
 module Fingerprint
 	# Given two fingerprints (master and copy) ensures that the copy has at least everything contained
@@ -77,7 +77,7 @@ module Fingerprint
 				end
 				
 				if @options[:progress]
-					$stderr.puts "# Progress: File #{processed_count} / #{total_count}; Byte #{processed_size} / #{total_size} = #{sprintf('%0.2f%', processed_size.to_f / total_size.to_f * 100.0)}"
+					$stderr.puts "# Progress: File #{processed_count} / #{total_count}; Byte #{processed_size} / #{total_size} = #{sprintf('%0.2f%%', processed_size.to_f / total_size.to_f * 100.0)}"
 
 					processed_size += (record['file.size'] || 0).to_i
 				end
@@ -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,54 +43,57 @@ module Fingerprint
 			
 			attr :duplicates_recordset
 			
+			def delete(path)
+				FileUtils.rm_f(path)
+			end
+			
 			def call
-				@options[:output] = @parent.output
-				
 				@duplicates_recordset = RecordSet.new
-				results = RecordSetPrinter.new(duplicates_recordset, @options[:output])
+				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|
-								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]
-								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

@@ -46,6 +46,10 @@ module Fingerprint
 		attr :metadata
 		attr :keys
 
+		def file?
+			@mode == :file
+		end
+
 		def [](key)
 			@metadata[key]
 		end
@@ -86,38 +90,54 @@ 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
+			
+			return record_set
 		end
 		
-		def self.load(io)
-			self.new.tap{|record_set| record_set.parse(io)}
-		end
-		
-		def initialize
+		def initialize(root = nil)
+			@root = root
 			@records = []
 			@paths = {}
 			@keys = {}
 			
 			@configuration = nil
-
+			
 			@callback = nil
 		end
-
+		
+		attr :root
+		
 		attr :records
 		attr :paths
 		attr :keys
-
+		
 		attr :configuration
-
+		
+		def full_path(path)
+			Build::Files::Path.join(@root, path)
+		end
+		
 		def <<(record)
 			@records << record
+			
 			if record.mode == :configuration
-				# What should we do if we get multiple configurations?
+				if @configuration
+					raise "Multiple configurations detected!"
+				end
+				
 				@configuration = record
+				@root ||= @configuration.path
 			else
 				@paths[record.path] = record
+				
 				record.keys.each do |key|
 					@keys[key] ||= {}
 					
@@ -125,7 +145,7 @@ module Fingerprint
 				end
 			end
 		end
-
+		
 		def include?(path)
 			@paths.include?(path)
 		end
@@ -222,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/scanner.rb

@@ -259,7 +259,7 @@ module Fingerprint
 			
 			if @options[:progress]
 				@progress = lambda do |read_size|
-					$stderr.puts "# Progress: File #{processed_count} / #{total_count}; Byte #{processed_size + read_size} / #{total_size} = #{sprintf('%0.3f%', (processed_size + read_size).to_f / total_size.to_f * 100.0)} (#{read_size}, #{processed_size}, #{total_size})"
+					$stderr.puts "# Progress: File #{processed_count} / #{total_count}; Byte #{processed_size + read_size} / #{total_size} = #{sprintf('%0.3f%%', (processed_size + read_size).to_f / total_size.to_f * 100.0)} (#{read_size}, #{processed_size}, #{total_size})"
 				end
 			end
 			

data/lib/fingerprint/version.rb

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

data.tar.gz.sig

@@ -0,0 +1,3 @@
+�X?�x�O��׍z"�y�����u�*�&6c��ơ+��<�wW��iZ���>�<b�Q}�5���5��æz���:/k���s�3�}{5����� Sc6���n�������4
�@YOTQ �h�& ������p%J�1/�ʔ�A^��Uf��UN
L��ؗbP��Q�|���I=���
+���^h�ߞYv�Ğ�,��<d��N�RCB����	��ם�|��Je~(gU�4�����j�mX]^�gS`n����B��5m;���>���~���r���7jB�棖��QYo!��� ���%�c��~��n�Cd��k��A/N�`�G��95[�%o�򋱕F��z9�*�f�����
+^6�l�����U"

metadata

@@ -1,14 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fingerprint
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Samuel Williams
+- Glenn Rempe
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-files
@@ -88,7 +117,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/fingerprint
-- lib/.DS_Store
 - lib/fingerprint.rb
 - lib/fingerprint/checker.rb
 - lib/fingerprint/checksums.rb
@@ -122,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Fingerprint is a tool for creating checksums of entire directory structures,