vera 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390655a8e0f68a6d79a054e7ded01e274d92336f9e47811f627a409fe2b4308e
-  data.tar.gz: 7d6b771345a524614f3396dbbc363f8fb305a34df36b20bbae946d487ffe3d2d
+  metadata.gz: 017aa63fe7bc5058567a110906bdf079707d561ffd256b0727b54ee23bb8f5e2
+  data.tar.gz: 8d20048815f689d5bf553f4df47ba2d7337f6bb221a0e2a1c0168c15af0763b5
 SHA512:
-  metadata.gz: f8afcf42416bfc5c37662028d6e88ed842311aea724632338122b16dfc070947133c8ec990055ca6dc5dd57f2646fea70b154fd4dc7c3fb4e933a84f0efa7710
-  data.tar.gz: e8900f74ce81a63a6e6ed050c3c6b31226b467357d74c6127903afb7067f7e81ac2b201b507f0f7644654d9716dd141d92331be483336366b0e1d6e793489710
+  metadata.gz: 288bee8f35014fbb71b2bbfdfd6aa53fde38e865301fcf0355243d8f019557e2d8e2d7fc77c6445b7f23ab3595f42ebb8560a5357b79cd06b08438c8e84583d9
+  data.tar.gz: 1925c8dac7c1d6231708822bcb1dea6cd8baa330e20db088f0284afc2e963f9ad43d99e60593645356fadcb7756a6074e05b47844cf8fe7083546c0bc3f41451

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    vera (0.1.1)
+    vera (0.3.0)
+      colorize
       commander
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    colorize (0.8.1)
     commander (4.5.2)
       highline (~> 2.0.0)
     diff-lcs (1.4.4)
@@ -47,6 +49,7 @@ GEM
     unicode-display_width (2.0.0)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
 
 DEPENDENCIES

data/README.md

@@ -57,9 +57,22 @@ This command works on JPG, MOV, HEIC and ARW files.
 
 ![vera rename](gif/renamer.gif)
 
+### Safe
+
+Should I delete all this media files? Is it **safe**? This command helps you understand that. This command will find the files even if you have changed the original file name of the files. 
+
+```bash
+# Are all the media files in Folder backed up in MY_EXTERNAL_HD?
+vera safe --path="Folder" --backup="/Volumes/MY_EXTERNAL_HD"
+```
+
+You can see it working here:
+
+![vera rename](gif/safe.gif)
+
 If you want to add more commands, feel free to contribute with a PR to Vera. In the next section I explain how to start working on it.
 
-## Developement
+## Development
 
 After checking out the repo, run `install.sh` to install dependencies. Then, run `rake spec` to run the tests.
 

data/bin/vera

@@ -31,3 +31,15 @@ command :rename do |c|
     Vera::Renamer::execute(options)
   end
 end
+
+command :safe do |c|
+  c.syntax = 'vera safe [options] --backup="/backupFolder"'
+  c.summary = 'Are this media files safe to delete?'
+  c.description = 'Searches if all the files in the current folder are in your backup folder recursevely.'
+  c.example 'description', 'vera safe --backup="/backupFolder"'
+  c.option '--path PATH', 'Where to execute the command. Default value is the current directory.'
+  c.option '--backup PATH', 'Your backup folder'
+  c.action do |args, options|
+    Vera::Safe::execute(options)
+  end
+end

data/lib/vera.rb

@@ -5,3 +5,7 @@ require_relative 'vera/timestamp'
 require_relative 'vera/version'
 require_relative 'vera/exiftool'
 require_relative 'vera/renamer'
+require_relative 'vera/safe'
+require_relative 'vera/icons'
+require_relative 'vera/media'
+require_relative 'vera/mediatype'

data/lib/vera/exiftool.rb

@@ -6,12 +6,12 @@ module Vera
       `exiftool "-FileCreateDate<#{date_property}" "-FileModifyDate<#{date_property}" #{files_string} 2>/dev/null`
     end
 
-    def self.is_installed?
-      system("which exiftool >/dev/null")
+    def self.installed?
+      system('which exiftool >/dev/null')
     end
 
     def self.change_filename_with_date(date_property, files_string)
-      system("exiftool '-FileName<$#{date_property}-$filename' -d \"%Y-%m-%d\" #{ files_string } 2>/dev/null")
+      system("exiftool '-FileName<$#{date_property}-$filename' -d \"%Y-%m-%d\" #{files_string} 2>/dev/null")
     end
   end
 end

data/lib/vera/icons.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'colorize'
+
+module Vera
+  class Icons
+    def self.check
+      ' ✓ '.green
+    end
+
+    def self.arrow
+      ' ⮕ '.green
+    end
+
+    def self.cross
+      ' ✖ '.red
+    end
+  end
+end

data/lib/vera/lister.rb

@@ -7,5 +7,9 @@ module Vera
          .map { |file| { path: "#{path}/#{file}", filename: file } }
          .select { |file| ext == File.extname(file[:filename]).gsub('.', '') }
     end
+
+    def self.all_media_files_recursive(path)
+      `find #{path.gsub(' ', '\ ')} -type f | grep -E "#{MediaType.all.join('|')}"`.split("\n")
+    end
   end
 end

data/lib/vera/media.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Vera
+  class Media
+    attr_reader :path, :size
+
+    def initialize(path)
+      @path = path
+      size = File.size(@path)
+    end
+
+    def filename
+      File.basename(@path)
+    end
+
+    def partial_hash
+      chunk_size = 1024 * 5
+      chunk = File.read(@path, chunk_size)
+      Digest::SHA1.hexdigest(chunk)
+    end
+
+    def real_hash
+      chunk = File.read(@path)
+      Digest::SHA1.hexdigest(chunk)
+    end
+  end
+end

data/lib/vera/mediatype.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Vera
+  class MediaType
+    MEDIA_TYPES = %w[MP4 MOV JPG HEIC ARW CR2].freeze
+
+    def self.all
+      MEDIA_TYPES
+    end
+  end
+end

data/lib/vera/renamer.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Vera
   class Renamer
     def self.execute(options)
-      unless Exiftool.is_installed?
-        puts """
+      unless Exiftool.installed?
+        puts ''"
           You need to install exiftool to use vera. You can run the following command to do it:
           bash <(curl -Ls https://git.io/JtbuH)
-        """
+        "''
         return
       end
       path = options.path
@@ -14,27 +16,27 @@ module Vera
       rename path
     end
 
-    def self.rename path
-      rename_files_with_date path, "ARW",  "DateTimeOriginal"
-      rename_files_with_date path, "JPG",  "DateTimeOriginal"
-      rename_files_with_date path, "HEIC", "DateTimeOriginal"
-      rename_files_with_date path, "MOV",  "CreationDate"
+    def self.rename(path)
+      rename_files_with_date path, 'ARW',  'DateTimeOriginal'
+      rename_files_with_date path, 'JPG',  'DateTimeOriginal'
+      rename_files_with_date path, 'HEIC', 'DateTimeOriginal'
+      rename_files_with_date path, 'MOV',  'CreationDate'
     end
 
-    def self.rename_files_with_date path, ext, date_property
-      puts "✅ Adding creation date to #{ext} files in the filename"
+    def self.rename_files_with_date(path, ext, date_property)
+      puts "#{Icons.check} Adding creation date to #{ext} files in the filename"
       files = Lister.all_files(path, ext)
       files = Renamer.exclude_already_renamed_files(files)
       if files.empty?
         puts "No files to rename for #{ext} file type."
         return
       end
-      files_string = files.map { |f| "\"#{f[:path]}\"" }.join(" ")
-      puts "❌Something went wrong" unless Exiftool.change_filename_with_date(date_property, files_string)
+      files_string = files.map { |f| "\"#{f[:path]}\"" }.join(' ')
+      puts "#{Icons.cross} Something went wrong" unless Exiftool.change_filename_with_date(date_property, files_string)
     end
 
-    def self.exclude_already_renamed_files files
-      files.select { |f| f[:filename].match(/\d+\-\d+\-\d+\-/) == nil }
+    def self.exclude_already_renamed_files(files)
+      files.select { |f| f[:filename].match(/\d+-\d+-\d+-/).nil? }
     end
   end
 end

data/lib/vera/safe.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+require 'colorize'
+
+module Vera
+  class Safe
+    def self.execute(options)
+      unless Exiftool.installed?
+        puts "
+          You need to install exiftool to use vera. You can run the following command to do it:
+          bash <(curl -Ls https://git.io/JtbuH)
+        "
+        return
+      end
+      path = options.path
+      path = Dir.pwd if options.path.nil?
+      path = File.expand_path(path)
+      backup_path = File.expand_path(options.backup)
+
+      unless File.directory?(path)
+        puts "#{path} is not a valid directory.".red
+        return
+      end
+
+      unless File.directory?(backup_path)
+        puts "#{backup_path} is not a valid directory.".red
+        return
+      end
+
+      safe_to_delete_path? path, backup_path
+    end
+
+    def self.safe_to_delete_path?(path, backup_path)
+      backup_media_files = Lister.all_media_files_recursive(backup_path)
+                                 .map { |f| Media.new(f) }
+
+      media_files = Lister.all_media_files_recursive(path)
+                                 .map { |f| Media.new(f) }
+
+      print_folders(path, backup_path)
+      print_number_of_files(media_files, backup_media_files)
+
+      select_candidates = candidates_by_file_size(media_files, backup_media_files)
+      found_files       = candidates_by_partial_hash(select_candidates)
+
+      print_list_of_files(found_files, backup_path)
+    end
+
+    def self.candidates_by_file_size(media_files, backup_media_files)
+      media_files.map do |media|
+        {
+          media: media,
+          candidates: backup_media_files.select { |c| c.size == media.size }
+        }
+      end
+    end
+
+    def self.candidates_by_partial_hash(media_files)
+      media_files.map do |hash|
+        media = hash[:media]
+        file_found = hash[:candidates].find do |m|
+          media.partial_hash == m.partial_hash
+        end
+
+        {
+          media: media,
+          file_found: file_found,
+          found: !file_found.nil?
+        }
+      end
+    end
+
+    def self.print_folders(path, backup_path)
+      message = "Trying to find #{path} files in #{backup_path}"
+
+      print_separator message.length
+      puts message.yellow
+      print_separator message.length
+    end
+
+    def self.print_number_of_files(media_files, backup_files)
+      backup_message = "In a total of #{backup_files.length} media files in your backup folder..."
+
+      print_separator backup_message.length
+      puts "Searching #{media_files.length} media files...".yellow
+      puts backup_message.yellow
+      print_separator backup_message.length
+    end
+
+    def self.print_separator length
+      length.times { print "-" }
+      print "\n"
+    end
+
+    def self.print_list_of_files(files, backup_dir)
+      found_message = "#{Icons.check} #{files.select { |f| f[:found] }.length } file(s) found"
+      not_found_message = "#{Icons.cross} #{files.reject { |f| f[:found] }.length } file(s) not found"
+
+      files.sort_by { |x| [(x[:found] ? 0 : 1), x[:path]] }
+           .each do |f|
+        found    = f[:found]
+        found_in = f[:file_found].path.gsub(backup_dir, '')
+        filename = f[:media].filename.ljust(15, ' ')
+
+        puts "#{Icons.check} #{filename} #{Icons.arrow} #{found_in}" if found
+        puts "#{Icons.cross} #{filename} not found." unless found
+      end
+
+      print_separator not_found_message.length
+      puts found_message
+      puts not_found_message
+      print_separator not_found_message.length
+    end
+
+    def self.filter_real_hash(hash)
+      {
+        media: hash[:media],
+        candidates: hash[:candidates].find do |m|
+          media.real_hash == m.real_hash
+        end
+      }
+    end
+  end
+end

data/lib/vera/timestamp.rb

@@ -3,11 +3,11 @@
 module Vera
   class Timestamp
     def self.execute(options)
-      unless Exiftool.is_installed?
-        puts """
+      unless Exiftool.installed?
+        puts ''"
           You need to install exiftool to use vera. You can run the following command to do it:
           bash <(curl -Ls https://git.io/JtbuH)
-        """
+        "''
         return
       end
       path = options.path
@@ -25,7 +25,7 @@ module Vera
 
     def self.rename_files_with_date(path, ext, date_property)
       files = Lister.all_files(path, ext)
-      puts "✅ Correcting timestamp for #{files.length} #{ext} files..."
+      puts "#{Icons.check} Correcting timestamp for #{files.length} #{ext} files..."
       if files.empty?
         puts 'Nothing to do here'
         return

data/lib/vera/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vera
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/vera.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'commander'
+  spec.add_dependency 'colorize'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.7'
 
-  spec.files         = Dir['./**/*'].reject { |file| file =~ %r{\./(bin|log|pkg|script|spec|test|vendor)} }
+  spec.files         = Dir['./**/*'].reject { |file| file =~ %r{\./(bin|log|pkg|script|spec|test|vendor|gif)} }
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vera
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Cortés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,15 +94,17 @@ files:
 - "./LICENSE.txt"
 - "./README.md"
 - "./Rakefile"
-- "./gif/renamer.gif"
 - "./install.sh"
 - "./lib/vera.rb"
 - "./lib/vera/exiftool.rb"
+- "./lib/vera/icons.rb"
 - "./lib/vera/lister.rb"
+- "./lib/vera/media.rb"
+- "./lib/vera/mediatype.rb"
 - "./lib/vera/renamer.rb"
+- "./lib/vera/safe.rb"
 - "./lib/vera/timestamp.rb"
 - "./lib/vera/version.rb"
-- "./vera-0.1.1.gem"
 - "./vera.gemspec"
 - "./vera.jpg"
 - bin/vera
@@ -113,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CLI tool to organize and manage media files