exiftool 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ZmZmRiYmQ2MWUyYzhhNWQwN2YxNDgxZjRmNzU2YTM0N2FiYzJjMw==
+    ZTRjNzEyZWQ4YWY0OTY1OGYzYWM2M2JhNTgyMjJmMGQ0NjE4YjNkMA==
   data.tar.gz: !binary |-
-    MWZkNDUxYmJiM2M4MTQ3ZWFiNmI4MWE1Y2UwNTA0MzNiMmZkZTcxNA==
+    MDk0ZGNhMjk5NWRkMDM2ZTg3NWQxMWM1MmU0YmY2OTMzMDg2YTIxZA==
 SHA512:
   metadata.gz: !binary |-
-    YjIwMTdhODJlYzgzZWIyZDQ4M2M3MTUyOTEzNGE0YjE1YjhiZTA2MjFjMjkz
-    NWUzNTgyZWRjMDIzYWZjMjdlZTM2NGE3ZTI2MGE4NGE1NGM3NTQxMzlhNDNj
-    M2UyMjc0Yzg1ZGI2MWUxYjdhOGZmMTY0NTVkODU2MTJlODZlNDY=
+    MWVhMzkzYmIyMjc3NDFhOWZmOTQ0MzJhOWNkMWFlZTJhNjI3OWNjN2YyNzFm
+    OWEzOGUzNjg0NWIwNzc3Zjg3NGY2MTNkMmM1YTVhYzJjNTRiN2M3YjgxYzkz
+    NjYzZmQ0OTEzNDE5ZjlmOGIwZmRiOTI3ZmZmMTkwOTg4NTUyYjk=
   data.tar.gz: !binary |-
-    ZjRhMjExY2QzZGFkOThlM2NmMDUzNWE4MjlmNjYyYTNlYzBlYmNiNmFjNjgx
-    YjFjNmZjOTI0YjU5NzhmZmVlZGJkYjFhZjI2NmZkNzViOTcyMzIyZmRiMjUx
-    MzQyNGJmNDM2MWRlNDU4N2EzZmMyNDEyY2JkNmVjNGJjOTgwOGU=
+    NTMyMzI1ODA1MDY1ZmQ1NmVlM2FmYTA3ZTI5ZWRkZjVjOWQwZDEwMGQ0MGIw
+    OTEyNTRjZmE0NTM5OGEwZDRkZjg1Mjg3M2ZhNGJhYjA1MzlmZGYwNjc0MmY3
+    MjYzODlhNzZiNmJiYmI0NzIyMjhiZGMyOWE5N2I3OWQzZGFiYTg=

data/lib/exiftool.rb

@@ -1,11 +1,13 @@
 require 'json'
 require 'shellwords'
 require 'exiftool/result'
+require 'forwardable'
 
 class Exiftool
   class NoSuchFile < StandardError ; end
   class NotAFile < StandardError ; end
   class ExiftoolNotInstalled < StandardError ; end
+  class NoDefaultResultWithMultiget < StandardError ; end
 
   def self.command=(path_to_exiftool)
     @command = path_to_exiftool
@@ -30,18 +32,22 @@ class Exiftool
     File.expand_path(filename)
   end
 
+  extend Forwardable
+
+  def_delegators :first_result, :to_hash, :to_display_hash, :symbol_display_hash, :raw, :[]
+
   def initialize(filenames, exiftool_opts = '')
     @file2result = {}
     filenames = [filenames] if filenames.is_a?(String)
     unless filenames.empty?
-      escaped_filenames = filenames.collect do |f|
+      escaped_filenames = filenames.map do |f|
         Shellwords.escape(self.class.expand_path(f.to_s))
-      end.join(" ")
+      end.join(' ')
       # I'd like to use -dateformat, but it doesn't support timezone offsets properly,
       # nor sub-second timestamps.
       cmd = "#{self.class.command} #{exiftool_opts} -j -coordFormat \"%.8f\" #{escaped_filenames} 2> /dev/null"
-      json = `#{cmd}`
-      raise ExiftoolNotInstalled if json == ""
+      json = `#{cmd}`.chomp
+      raise ExiftoolNotInstalled if json == ''
       JSON.parse(json).each do |raw|
         result = Result.new(raw)
         @file2result[result.source_file] = result
@@ -49,24 +55,20 @@ class Exiftool
     end
   end
 
+  def results(include_results_with_errors = false)
+    if include_results_with_errors
+      @file2result.values
+    else
+      @file2result.values.select { |ea| !ea.errors? }
+    end
+  end
+
   def result_for(filename)
     @file2result[self.class.expand_path(filename)]
   end
 
   def files_with_results
-    @file2result.values.collect { |r| r.source_file unless r.errors? }.compact
-  end
-
-  def to_hash
-    first.to_hash
-  end
-
-  def to_display_hash
-    first.to_display_hash
-  end
-
-  def symbol_display_hash
-    first.symbol_display_hash
+    results.map { |ea| ea.source_file }
   end
 
   def errors?
@@ -75,8 +77,8 @@ class Exiftool
 
   private
 
-  def first
-    raise InvalidArgument, 'use #result_for when multiple filenames are used' if @file2result.size > 1
+  def first_result
+    raise(NoDefaultResultWithMultiget, 'use #result_for when multiple filenames are used') if @file2result.size > 1
     @file2result.values.first
   end
 end

data/lib/exiftool/{parser.rb → field_parser.rb}

@@ -2,7 +2,7 @@ require 'time'
 require 'rational'
 
 class Exiftool
-  class Parser
+  class FieldParser
 
     WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
     FRACTION_RE = /^(\d+)\/(\d+)$/
@@ -25,6 +25,15 @@ class Exiftool
       "Warning: Parsing '#{raw_value}' for attribute '#{key}' raised #{e.message}"
     end
 
+    YMD_RE = /\A(\d{4}):(\d{2}):(\d{2})\b/
+
+    def ymd_value
+      if datish?
+        ymd = raw_value.scan(YMD_RE).first
+        ymd.join.to_i if ymd
+      end
+    end
+
     private
 
     def for_lat_long
@@ -36,8 +45,12 @@ class Exiftool
       end
     end
 
+    def datish?
+      raw_value.is_a?(String) && display_key =~ /\bdate\b/i
+    end
+
     def for_date
-      if raw_value.is_a?(String) && display_key =~ /\bdate\b/i
+      if datish?
         try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S%z') } ||
           try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S.%L%z') }
       end

data/lib/exiftool/result.rb

@@ -1,21 +1,28 @@
-require 'exiftool/parser'
+require 'exiftool/field_parser'
 
 class Exiftool
   class Result
-    attr_reader :raw_hash, :to_hash, :to_display_hash, :symbol_display_hash
+    attr_reader :raw, :to_hash, :to_display_hash, :sym2display, :display2sym
 
     def initialize(raw_hash)
-      @raw_hash = {}
+      @raw = {}
       @to_hash = {}
       @to_display_hash = {}
-      @symbol_display_hash = {}
+      @sym2display = {}
       raw_hash.each do |key, raw_value|
-        p = Parser.new(key, raw_value)
-        @raw_hash[p.sym_key] = raw_value
+        p = FieldParser.new(key, raw_value)
+        @raw[p.sym_key] = raw_value
         @to_hash[p.sym_key] = p.value
         @to_display_hash[p.display_key] = p.value
-        @symbol_display_hash[p.sym_key] = p.display_key
+        @sym2display[p.sym_key] = p.display_key
+
+        ymd = p.ymd_value
+        if ymd
+          ymd_key = "#{p.sym_key}_ymd".to_sym
+          @to_hash[ymd_key] = ymd
+        end
       end
+      @display2sym = @sym2display.invert
     end
 
     def [](key)

data/lib/exiftool/version.rb

@@ -1,3 +1,3 @@
 class Exiftool
-  VERSION = Gem::Version.new('0.4.0')
+  VERSION = Gem::Version.new('0.5.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exiftool
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,7 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/exiftool.rb
-- lib/exiftool/parser.rb
+- lib/exiftool/field_parser.rb
 - lib/exiftool/result.rb
 - lib/exiftool/version.rb
 homepage: https://github.com/mceachen/exiftoolr