dfm 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODJlN2RkMDc1YzFkOGNjMmViZWI5Y2EwM2YwMmRiZTkxNjkwYTg5Yw==
+    ZjAyNGI2NDE4M2M4NzRmODUwNjQzYjkxZTFjNjQxZTJlNjg3NTAxMA==
   data.tar.gz: !binary |-
-    YTAwMTA5OWJiMWZhMWMyZmIyZjMzNWJkZTIyYjBjYTRjNzBjZjNlZQ==
+    MzBiY2RkYTcxNmI0ODlhMGE0ZTdhNmU3NjFhMTRkYTBhZGE4ODRiZg==
 SHA512:
   metadata.gz: !binary |-
-    Y2VkNzZjMDNjMDY1ZWMxMTZlNDVmNTI1ZmY4OGU5OTRiYTc0YTJkNDA4MDdj
-    NDQ4MDg5YzY0YzdiYWJlNzY4ZDI3YTg3OGVmYzRhYTBjMDVjZGNkNGQzNmEz
-    ZjIwMWE2YjcyOGE1ZGY0Zjg5MTkzOGEyYzBhYjE0ODVhZDE5Yjc=
+    M2IxYzYyZGIyZDQzYmU2ZTIyOTM1NzIyYWE1ZDNkM2QwNGZjYTE4OGIxNTJk
+    ZmMwYWYzZDZiMTBjMWE0NjVmNmIwOTIyMzg0ODZkNmMyZjgwZTljOWZkZmU4
+    ZjYyODNlM2VkMDZkMjAwYWE4NTNkYjMxZjllODFjYThkYTY2NWE=
   data.tar.gz: !binary |-
-    MTkzMzZhMDI5NzJhYTBkODg0MzkxNjFkZDUwNDllNmY5OTNlYzFmNmJhZmE0
-    YjhlN2E2YWJiYzZjMDhiYzdhNTQzZmY1Zjk5M2UxNGYzNDI0MTdjMTc5Mjk4
-    ODQzODk5ZTc0NDE2YzFkZjk5MTFjNjkxYzZkYWRjNWU0ZmQzYmQ=
+    Yjc3OTc5MTlhYmVmOTM5OTgyY2MxZGQyYzg2OGZkZDcwMjE4YjM1ZWIzMDYy
+    NTljYjZlNmVmZDJlMjg3NDI1ODFjMmM1ZWJhYjEwM2RiNmE4MjMyZTJjZDYx
+    OGMxZWM1MDQ1OWQ2NjBlNzJhNmJlNWMxN2NkZmM1ZDc1MTU1OTE=

data/README.md

@@ -2,3 +2,34 @@ dfm
 ===
 
 Duplicate File Manager
+
+The purpose of dfm is to locate duplicate files through a recursive search.
+
+You can create an instance of the DFM object with optionally secifing the
+directory path and the file extensions.
+
+    instance = DFM.new( path: './', filters: ["jpg","png"] )
+
+If you are using a ruby version before 2 then this would be:
+
+    instance = DFM.new( { :path => './', :filters => ["jpg","png"] } )
+
+Then you may get a hash of the hex matches (indacating files with identical content) by
+
+    instance.hex
+
+And by duplicate faile name by
+
+    instance.name
+
+Either of these can be called with false if you want only single instances of files.
+
+    instance.hex( false )
+    instance.name( false )
+
+---
+
+Also included is a command line version which outputs nicely formatted JSON in case
+you would like to use it with anything else.  Type `dfm -h` on the command line to get
+a list of available options.  Running `dfm` by itself will recursively search the current
+folder for all duplicates by both file name and hash indexes.

data/bin/dfm

@@ -13,7 +13,7 @@ options = {}
 printers = Array.new
 
 OptionParser.new do |opts|
-	opts.banner = "Usage: dfm [options] [path]\nDefaults: dfm -x -d ." + File::SEPARATOR
+	opts.banner = "Usage: dfm [options] [path]\nDefaults: dfm -xd ." + File::SEPARATOR
 	opts.on("-f", "--filters FILTERS", Array, "File extension filters") do |filters|
 		options[:filters] = filters
 	end
@@ -33,11 +33,12 @@ end.parse!
 path = ARGV.select {|i| File.directory? i }[0]
 program = DFM.new( options.update( { :path => path } ) )
 if printers.empty?
-	program.print_duplicates
-	program.print_duplicates( "name" )
+	puts JSON.pretty_generate( program.hex.update( program.name ) )
 else
-	if printers.include? "dh"; program.print_duplicates; end
-	if printers.include? "dn"; program.print_duplicates( "name" ); end
-	if printers.include? "sh"; program.print_singles; end
-	if printers.include? "sn"; program.print_singles( "name" ); end
+	hash = {}
+	if printers.include? "dh"; hash.update( program.hex ); end
+	if printers.include? "dn"; hash.update( program.name ); end
+	if printers.include? "sh"; hash.update( program.hex( false ) ); end
+	if printers.include? "sn"; hash.update( program.name( false ) ); end
+	puts JSON.pretty_generate( hash )
 end

data/lib/dfm/version.rb

@@ -1,7 +1,9 @@
 class DFM
-	VERSION = "0.0.2"
+	VERSION = "0.0.3"
 end
 
+# Version 0.0.3
+# * Updated commandline app to merge miltiple JSON searches as single JSON output
 # Version 0.0.2
 # * A little more DRY
 # * Fixed duplicates of only 2

data/lib/dfm.rb

@@ -57,11 +57,7 @@ class DFM
 	end
 
 	def select_duplicates( opt = { :hash => @files_by_hexdigest, :duplicates => true } )
-		if opt[ :duplicates ]
-			opt[ :hash ].select { |k,v| v.length >= 2 }
-		else
-			opt[ :hash ].select { |k,v| v.length == 1 }
-		end
+		opt[ :hash ].select { |k,v| opt[ :duplicates ] ? ( v.length >= 2 ) : ( v.length == 1 ) }
 	end
 
 	def print_match( opt = { :type => "hex", :duplicates => true } )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dfm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel P. Clark / 6ftDan(TM)
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2014-06-16 00:00:00.000000000 Z
 dependencies: []
-description: Parse duplicate files to process!
+description: Duplicate File Manager.  Parse duplicate files to process!
 email: webmaster@6ftdan.com
 executables:
 - dfm
@@ -45,5 +45,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Duplicate File Manager!
+summary: Duplicate File Manager.
 test_files: []