exif_datify 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5627d18c7b10a93eb703a8a22a338720d540f23e
-  data.tar.gz: e9375180c33347f38d9467b1f1a8217cf3c36498
+  metadata.gz: 1baeb60c1646391ea957a9aff2855dc313527592
+  data.tar.gz: d25ca1f3e98dfdc20073b1d9efb5ce4f6bd24a9a
 SHA512:
-  metadata.gz: 8fafebe664cfab261d70fc57d736cadfa465189522dccc4ca5b992f36f44fd9686431445b9e0718c1dfe4a966998f4414c0520efac9ed9dd63ab832cd7f20504
-  data.tar.gz: e34842e0ee4b4830f9dba477890ac3e24e1b5fce08854284124e72e7882ac46ba98017b283028890116c94b4e02bc7ab91529bd0e2596a0b9cebf21c3223a4c1
+  metadata.gz: ce49620dce50308bd452f7c4fc167289caf6342099fc4cebc4966187683d37336f75625177e0d3265a068e807ac2caeeac1602fbef26ae52fb2e062ebf663b07
+  data.tar.gz: 28ee0c87e4228f59c7259461512e281f12d0e32980ee04fe0cbfaa946cc3ff48d1e58982ec08a3ab93451ce6e21c524743a6011d7fa5765963a79fcdbf28596e

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.13.0
+addons:
+  apt:
+    packages:
+    - exiftool

data/README.md

@@ -1,5 +1,7 @@
 # ExifDatify
 
+[![Build Status](https://img.shields.io/travis/hwaterke/exif_datify/master.svg?style=flat-square)](https://travis-ci.org/hwaterke/exif_datify)
+
 Prepend files with date and time from exif information
 
 ## Prerequisites

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
 task :default => :spec

data/exe/datify

@@ -10,11 +10,27 @@ extensions = nil
 opt_parser = OptionParser.new do |opts|
   opts.banner = "Usage: datify [options] path"
 
+  opts.on('-r', '--rename', "Sets the operation to renaming (default)") do
+    date_extractor.rename!
+  end
+
+  opts.on('-m', '--move DESTINATION_FOLDER', "Sets the operation to move") do |destination|
+    date_extractor.move!(destination)
+  end
+
+  opts.on('-c', '--copy DESTINATION_FOLDER', "Sets the operation to copy") do |destination|
+    date_extractor.copy!(destination)
+  end
+
+  opts.on('-s', '--subdirectories', "For move and copy, create new directories in destination for each year and month") do
+    date_extractor.month_subdirectories!
+  end
+
   opts.on("-e", "--ext jpg,mov,png", Array, "File extensions to process.", "All by defaults.") do |list|
     extensions = list.map { |e| ".#{e.downcase}" }
   end
 
-  opts.on("-t", "--tags x,y,z", Array, "EXIF tags to use. Ordered by priority.", "Default is #{date_extractor.tags.join(',')}") do |list|
+  opts.on("-t", "--tags x,y,z", Array, "EXIF tags to use. Ordered by priority.", "Default is #{date_extractor.tags.join(', ')}") do |list|
     date_extractor.tags = list
   end
 
@@ -26,6 +42,10 @@ opt_parser = OptionParser.new do |opts|
     date_extractor.quiet!
   end
 
+  opts.on("-v", "--verbose", "Verbose logging") do |q|
+    date_extractor.logger.level = Logger::DEBUG
+  end
+
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit
@@ -40,7 +60,7 @@ if File.directory?(ARGV[0])
     next if FileTest.directory?(entry)
     next unless extensions.nil? or extensions.include?(File.extname(entry).downcase)
     begin
-      date_extractor.rename(entry)
+      date_extractor.process(entry)
     rescue StandardError => e
       puts "Error: #{e}"
     end

data/exif_datify.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_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/exif_datify/version.rb

@@ -1,3 +1,3 @@
 module ExifDatify
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/lib/exif_datify.rb

@@ -1,25 +1,52 @@
 require "exif_datify/version"
 require 'date'
 require 'json'
+require 'logger'
+require 'fileutils'
 
 module ExifDatify
   class DateExtractor
-    attr_reader :counters
+    attr_reader :operation, :counters, :logger
     attr_accessor :datetime_format, :tags
     DATETIME_REGEX = /^\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}/
 
     def initialize
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::WARN
       @tags = ['DateTimeOriginal', 'MediaCreateDate']
       @datetime_format = "%Y-%m-%d_%H-%M-%S_"
       @quiet = false
       @counters = Hash.new(0)
+      rename!
+      @month_subdirectories = false
     end
 
     def quiet!
       @quiet = true
     end
 
+    def month_subdirectories!
+      @month_subdirectories = true
+    end
+
+    def rename!
+      @operation = :rename
+    end
+
+    def move!(destination)
+      raise "#{destination} does not exist" unless FileTest.directory?(destination)
+      @operation = :move
+      @destination = destination
+    end
+
+    def copy!(destination)
+      raise "#{destination} does not exist" unless FileTest.directory?(destination)
+      @operation = :copy
+      @destination = destination
+    end
+
     def extract_datetime(file_path)
+      @logger.debug "Extracting datetime from #{file_path}"
       meta = exiftool(file_path)
       @tags.each do |tag|
         return DateTime.parse(meta[tag]) if meta[tag]
@@ -27,15 +54,60 @@ module ExifDatify
       nil
     end
 
-    def rename(file_path)
+    def process(file_path)
       @counters[:total] += 1
-      unless File.basename(file_path) =~ DATETIME_REGEX
-        prepend_date(file_path)
+      datetime = extract_datetime(file_path)
+      if datetime.nil?
+        puts "Could not extract date from #{current_name}" unless @quiet
+      else
+        operate(file_path, datetime)
       end
     end
 
     private
 
+    def destination(file_path, datetime)
+      return File.dirname(file_path) if operation == :rename
+      return @destination unless @month_subdirectories
+      File.join(@destination, datetime.strftime('%Y'), datetime.strftime('%m'))
+    end
+
+    def operate(file_path, datetime)
+      @logger.debug "Processing #{file_path} with #{datetime}"
+      current_name = File.basename(file_path)
+      prefix = datetime.strftime(@datetime_format)
+
+      # No prefix if the basename has a good format already.
+      prefix = '' if current_name.start_with?(prefix) or current_name =~ DATETIME_REGEX
+
+      prefixed_name = File.join(destination(file_path, datetime), prefix + current_name)
+      unless File.expand_path(file_path) == File.expand_path(prefixed_name)
+        if File.exist?(prefixed_name)
+          raise "Cannot #{operation} #{current_name}, #{prefixed_name} already exists."
+        else
+          @logger.debug "Destination: #{prefixed_name}"
+          perform_operation(file_path, prefixed_name)
+          puts "Performed #{operation} on #{current_name} to #{prefixed_name}." unless @quiet
+          @counters[:renamed] += 1
+        end
+      end
+    end
+
+    def perform_operation(file_path, destination)
+      case operation
+      when :rename
+        File.rename(file_path, destination)
+      when :move
+        FileUtils.mkdir_p File.dirname(destination)
+        FileUtils.mv(file_path, destination)
+      when :copy
+        FileUtils.mkdir_p File.dirname(destination)
+        FileUtils.cp(file_path, destination)
+      else
+        raise "Unknown operation #{operation}"
+      end
+    end
+
     def prepend_date(file_path)
       datetime = extract_datetime(file_path)
       current_name = File.basename(file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exif_datify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Harold Waterkeyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Name files based on exif information
 email:
 - hwaterke@users.noreply.github.com
@@ -47,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -57,6 +73,8 @@ files:
 - exif_datify.gemspec
 - lib/exif_datify.rb
 - lib/exif_datify/version.rb
+- test_data/picJan15.png
+- test_data/picNov14.png
 homepage: https://github.com/hwaterke/exif_datify
 licenses:
 - MIT
@@ -77,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Prepend files with date and time from exif information