rdupes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f75ec8d82ddbdc1319fdfdcfcfad7696d7fccd
-  data.tar.gz: b74a50547365ff3370009416d6927262b29341e9
+  metadata.gz: 52c253e303c1b31d334dbaae5354cafc18397db2
+  data.tar.gz: 27bff2346e926eb9f483390048dcaff908a1f907
 SHA512:
-  metadata.gz: ad19c096fc4d671d14c3e8a5752b02e960f203abd702e0a851bb2c0abc71591b3abb85aac082ec4fc7fa65bd66f8e4d552337642205d2192fc560b7511eb31a5
-  data.tar.gz: 4a8a9eb52b3e0c006a532452c78dc937da9c64b728a953fbd872d798355d6dfb165af55e8b3926d236087d7fe83a515b427daa837704b7c40277e5cd12ac4054
+  metadata.gz: ce5fdaf876597b5e329db389b87c6b3144d886437f961ff3b22e7755c83a7e8c95159cac3887091ed89bc9579b9cb5e1c949afe90320be9efe9baf62125a8c1a
+  data.tar.gz: 3c235c3dd62631e8eb33088d4f5ef15f86246eb88317d4978fe319cbcafa7e9d5cd0181516791c9888dfe18621ca734fe071b33b68fe88d0dc44a74561b4e37a

data/exe/rdupes

@@ -12,6 +12,10 @@ opt_parser = OptionParser.new do |opts|
     rdupe.add_reference_directory directory
   end
 
+  opts.on("-d", "--dryrun", "Runs the analysis but without any file deletion") do |q|
+    rdupe.dry_run!
+  end
+
   opts.on("-q", "--quiet", "Runs quietly") do |q|
     rdupe.quiet!
   end

data/lib/rdupes.rb

@@ -2,6 +2,7 @@ require "rdupes/version"
 require 'logger'
 require 'shellwords'
 require 'tmpdir'
+require 'colorize'
 
 module Rdupes
   class Finder
@@ -15,16 +16,24 @@ module Rdupes
       @counters = Hash.new(0)
       @quiet = false
       @keep = false
+      @dry_run = false
     end
 
     def quiet!
+      @logger.debug "Enabling quiet mode"
       @quiet = true
     end
 
     def keep!
+      @logger.debug "Enabling keep mode. Will keep the fdupes output"
       @keep = true
     end
 
+    def dry_run!
+      @logger.debug "Enabling dry run mode"
+      @dry_run = true
+    end
+
     def add_reference_directory(directory)
       directory_path = File.expand_path(directory)
       @logger.debug "Adding #{directory_path} to the reference directories"
@@ -47,26 +56,37 @@ module Rdupes
       raise 'No directories provided for duplicate search' if @search_directories.empty?
       raise 'fdupes needs to be installed' unless command? 'fdupes'
 
-      unless @quiet
-        puts "Processing #{@search_directories}"
-        puts "Reference directory: #{@reference_directories}"
-      end
+      say "Processing #{@search_directories}"
+      say "Reference directory: #{@reference_directories}"
 
       Dir.mktmpdir do |dir|
-        fdupe_output = File.join(dir, 'duplicates.log')
+        fdupes_output = File.join(dir, 'duplicates.log')
         # Redirect to file
-        cmd = "fdupes -rq #{directories_for_search.shelljoin} > #{fdupe_output}"
+        cmd = "fdupes -rq #{directories_for_search.shelljoin} > #{fdupes_output}"
         @logger.debug "Executing: #{cmd}"
         r = system cmd
         raise "fdupe crashed " unless r
-        process_fdupes_result(fdupe_output)
-        FileUtils.cp fdupe_output, "#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}_duplicates.log" if @keep
-        puts "Deleted #{@counters[:deleted]} files" unless @quiet
+        process_fdupes_result(fdupes_output)
+
+        if @keep
+          fdupes_output_copy = "#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}_duplicates.log"
+          say "Copying fdupes result to #{fdupes_output_copy}"
+          FileUtils.cp fdupes_output, fdupes_output_copy
+        end
+
+        say "Found #{@counters[:duplicate_groups]} duplicate groups"
+        say "Found #{@counters[:duplicate_entries]} duplicate entries"
+        say "Flagged #{@counters[:flag_for_delete]} files for deletion"
+        say "Deleted #{@counters[:deleted]} files"
       end
     end
 
     private
 
+    def say(text)
+      puts text unless @quiet
+    end
+
     def command?(command)
       system("which #{ command} > /dev/null 2>&1")
     end
@@ -91,18 +111,26 @@ module Rdupes
 
     def handle_duplicate_group(duplicate_group)
       @logger.debug "Handling group of #{duplicate_group.size} duplicates"
+      say "#{'==>'.blue} Group of #{duplicate_group.size} duplicates"
+      @counters[:duplicate_groups] += 1
+      @counters[:duplicate_entries] += duplicate_group.size
       reference_files, duplicate_files = duplicate_group.partition do |f|
         @reference_directories.any? { |rf| File.expand_path(f).start_with?(rf) }
       end
       # Keep the first duplicate if there is no reference file.
-      duplicate_files.shift if reference_files.empty?
+      say "- #{duplicate_files.shift}".green if reference_files.empty?
+      reference_files.each { |rf| say "- #{rf}".green }
       duplicate_files.each { |dp| handle_duplicate_file(dp) }
     end
 
     def handle_duplicate_file(duplicate_file)
-      @counters[:deleted] += 1
       @logger.debug "Handling duplicate #{duplicate_file}"
-      File.delete(duplicate_file)
+      @counters[:flag_for_delete] += 1
+      say "- #{duplicate_file}".red
+      unless @dry_run
+        File.delete(duplicate_file)
+        @counters[:deleted] += 1
+      end
     end
   end
 end

data/lib/rdupes/version.rb

@@ -1,3 +1,3 @@
 module Rdupes
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/rdupes.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "colorize"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rdupes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Harold Waterkeyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement