imagebackup 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a1d4dd786b4165fd4812dea1de48ef9ad9ad9040e2b4c572f633117e7147f9
-  data.tar.gz: 67d0e990a7491fee092a0b58386b218a52635ae1f68a79608dca347c791d8814
+  metadata.gz: adbf3e8724183017c88e48e354363cbe74c985d3585cb9665346f32516a5338e
+  data.tar.gz: 7b74e6acd3b81d47af8cbbe0aca1620d8eab1af475aed59954457671eb0cb021
 SHA512:
-  metadata.gz: 9b0b396b58101630b0c8390e9b0a6b8e139774b29d775136518becc866157bc66245682be814fc299b79095147f00c53d15a13079017fdc73b2973a8148aa511
-  data.tar.gz: d6c1d1dadc59c952dfca3d99f559fc69538459cde68d6268914a5e25bb4668fe5ec05d8e4f6e4d6914744cc91623331c79556bc3fbfc3b96c33d7322a9b7e38f
+  metadata.gz: af4f028e7386a4e42d2cf3fa29d9526af6757e77de10a04d677863f2137cc47babc849aa1c6b39c51a81bf96a3ecb2ea9a9df7164e205e0526c7c3663d2be7a0
+  data.tar.gz: e65c8cf849463f16aaaaa165c5ede4b0d649736272215c65d90797431bfb3e028069f4dd2c3113aadbb7615beb0eab357805cc7ee74aa45c9920d9ec05cee673

data/.gitignore

@@ -6,6 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+README_assessment.md
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -5,6 +5,7 @@
 ### A simple terminal app to crawl a folder (usually a camera card's DCIM folder) for pictures and videos, and pop them in dated folders to your destination folder of choice. Uses exif data when available, creation_time, or the file's own creation date if nothing better is present.  
 ### Will also copy over any xmp sidecar files found, not overwriting.
 
+Source is available here: [https://github.com/adrian-sal-kennedy/imagebackup]()
 
 ## Options:
 -n, --dry-run  
@@ -72,13 +73,15 @@ This mode can be useful if you want to operate on the files in one place but kee
 ## Dependencies:
 
 **Ruby** v2.3.0 or greater, plus gems:
-  - exiv2
-  - ffprober  
+  - [exiv2](https://rubygems.org/gems/exiv2/versions/0.0.8) to retrieve EXIF date/time.
+  - [ffprober](https://github.com/beanieboi/ffprober) to retrieve video container date/time tags if present.
+  - [colorize](https://github.com/fazibear/colorize) to make output a little more readable and engaging.
 
 Ruby modules:
-  - fileutils.rb
+  - [fileutils](https://ruby-doc.org/stdlib-2.4.1/libdoc/fileutils/rdoc/FileUtils.html) to manage file operations (get attributes, copy, move, link).
+  - [csv](https://ruby-doc.org/stdlib-2.6.1/libdoc/csv/rdoc/CSV.html) to process the list of available file types.
 
 Bundler should handle all these dependencies. If for some reason it doesn't you can run this in terminal:  
 ```bash
-$ gem install exiv2 ffprober
-```
+$ gem install exiv2 ffprober colorize
+```

data/imagebackup.gemspec

@@ -29,6 +29,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_dependency 'exiv2'
   spec.add_dependency 'ffprober'
 end

data/lib/classes/filetypes.rb

@@ -1,4 +1,3 @@
-require 'csv'
 
 # FileTypes is a very simple file class to store and retrieve the list of files
 # we are interested in backing up.

data/lib/imagebackup.rb

@@ -8,9 +8,11 @@ require_relative 'methods/get_dates'
 require_relative 'methods/copy_pic'
 require_relative 'methods/display_help'
 
+require 'colorize'
 require 'exiv2'
 require 'fileutils'
 require 'ffprober'
+require 'csv'
 
 def main_loop(dest, dryrun = true, file_op = 'copy')
   file_types = FileTypes.list
@@ -23,6 +25,7 @@ def main_loop(dest, dryrun = true, file_op = 'copy')
 
     copy_pic(file, outfile, destpath, dryrun, file_op)
   end
+  puts "\nFinished!\n".colorize(:light_green)
 end
 
 dryrun = true
@@ -42,16 +45,17 @@ if ARGV.include?('-a')
   ext = ARGV[ARGV.index('-a') + 1]
   type = ARGV[ARGV.index('-a') + 2]
   ARGV.slice!(ARGV.index('-a')..ARGV.index('-a') + 2)
+  FileTypes.add(ext, type)
 end
 if ARGV.include?('--add-filetype')
   ext = ARGV[ARGV.index('--add-filetype') + 1]
   type = ARGV[ARGV.index('--add-filetype') + 2]
   ARGV.slice!(ARGV.index('--add-filetype')..ARGV.index('--add-filetype') + 2)
+  FileTypes.add(ext, type)
 end
-FileTypes.add(ext, type) if ext
 if (ARGV & ['-n', '--dry-run']).any?
   dryrun = true
-  puts 'Doing a dry run - no operations will happen.'
+  puts 'Doing a dry run - no operations will happen.'.colorize(:light_magenta)
   sleep 1
   ARGV.delete('-n')
   ARGV.delete('--dry-run')
@@ -59,7 +63,7 @@ else
   dryrun = false
 end
 
-display_help if (ARGV & ['-h', '--help', '-?']).any?
+display_help("Exited normally",:light_green) if (ARGV & ['-h', '--help', '-?']).any?
 
 if ARGV[0].to_s == ''
   display_help
@@ -67,7 +71,7 @@ elsif File.exist?(ARGV[0])
   main_loop(ARGV[0], dryrun, file_op)
 elsif ARGV[0][0] == '-'
   puts "Invalid option!\n-----\n\n"
-  display_help
+  display_help("\n-----\nInvalid option: \"#{ARGV[0]}\"!\n\n",:red)
 else
   puts 'Specified destination does not exist. Please create this folder first.'
 end

data/lib/imagebackup/version.rb

@@ -1,3 +1,3 @@
 module Imagebackup
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/methods/copy_pic.rb

@@ -1,21 +1,18 @@
 def process_file(file, outfile, dryrun = nil, file_op = 'cp')
   if dryrun
-    puts "pretending to #{file_op} \"#{file} to #{outfile}\""
+    puts "#{"pretending to ".colorize(:light_green)}#{file_op} \"#{file}\"#{" to ".colorize(:light_green)}\"#{outfile}\""
   else
     puts "#{file_op}-ing \"#{file} to #{outfile}\"..."
     FileUtils.public_send(file_op, file, outfile)
-    FileUtils.public_send(file_op, "#{file}.xmp", outfile, force: true)
-    if file_op == 'cp'
-      FileUtils.public_send(file_op, "#{file}.xmp", outfile)
-    else
-      FileUtils.public_send(file_op, "#{file}.xmp", outfile, force: true)
+    if File.exist?("#{file}.xmp")
+      FileUtils.public_send(file_op, "#{file}.xmp", "#{outfile}.xmp")
     end
   end
 end
 
 def copy_pic(file, outfile, destpath, dryrun = nil, file_op = 'cp')
   if File.exist?(outfile)
-    puts "\"#{outfile}\" already exists. Skipping..."
+    puts "\"#{outfile}\" #{"already exists. Skipping...".colorize(:light_blue)}."
   else
     unless dryrun
       unless File.exist?(destpath)

data/lib/methods/display_help.rb

@@ -1,4 +1,4 @@
-def display_help
+def display_help(err=nil,color=nil)
   print <<~HELPFILE
     ===== ImageBackup =====
 
@@ -22,7 +22,7 @@ def display_help
                                              but ensure there's a blank line at the end or this program
                                              may behave badly.
 
-    -m                                       will move (deleting the original), which is probably not a
+    -m                                       Will move (deleting the original), which is probably not a
                                              good idea in most cases but still useful at times.
 
     Usage:
@@ -63,20 +63,7 @@ def display_help
     $ imagebackup.rb --link ~/Photos/raw
 
     This mode can be useful if you want to operate on the files in one place but keep them on their media. Particularly useful for large movie files.
-
-    Dependencies:
-
-    Ruby v2.3.0 or greater, plus gems:
-     - exiv2
-     - ffprober
-
-    Ruby modules:
-     - fileutils
-
-    Bundler should handle all these dependencies. If for some reason it doesn't you can run this in terminal:
-    $ gem install exiv2 ffprober
-
   HELPFILE
-
+  puts err.to_s.colorize(color)
   exit(0)
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: imagebackup
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - adrian-sal-kennedy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-13 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: exiv2
   requirement: !ruby/object:Gem::Requirement