exiftoolr 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4230e0116eee40f519e4259f6c8469c4756bf7
-  data.tar.gz: 3ab21055dae2d4f3b4bc5839c0d096da8beeb323
+  metadata.gz: ecd656c3093b0eb6f3f94cc402bf5ee14a9b13ba
+  data.tar.gz: a8129d314f15fe908720f07393581b251ae95bfa
 SHA512:
-  metadata.gz: 23a797844c0196d46919811515202ad52dcf68647a07ec8f3ee9e3cd50fda1ff47269e3308eff5d2cb568341a7c3dfe6dc116c91827e5b612877c91dae0e0b9e
-  data.tar.gz: 2e3966f75669e3ade2bc0458f83dbcb202f939fb2d314f58cf9ba0c2c437fea691770cd81296668b8cca9a2f8393efe6b298641706a5a6c77c47d2c0ebf143a7
+  metadata.gz: d8bcb6cc7a2dce7917f64c00e616f2493662562ff11ecfbc1bc49665311fd372c6ce057db7e343d45e7cd09e815cdf1ea3dd1f0bed395e086e57c17bbb62c685
+  data.tar.gz: 051740e233bd226e7293e4dd332bd22f1de4cc785f670bd3f43b324481d958c75f7ae515199bb8e654f58bd7c002ac3e8a2487b46dbc8f32068909b5d892d9e4

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 script: bundle exec rake
 before_install:
- - sudo apt-get update
- - sudo apt-get install libimage-exiftool-perl
+  - sudo apt-get install libimage-exiftool-perl
 rvm:
   - 1.9.3
   - 2.0.0
+  - rbx-19mode
+  - jruby-19mode

data/README.md

@@ -8,7 +8,9 @@ This gem is the simplest thing that could possibly work that
 reads the output of [exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool)
 and renders it into a ruby hash, with correctly typed values and symbolized keys.
 
-## What constitutes "correct"?
+Rubies 1.9 and later are supported.
+
+## What constitutes "correct values"?
 
 * GPS latitude and longitude are rendered as signed floats,
   where north and east are positive, and west and south are negative.
@@ -16,22 +18,10 @@ and renders it into a ruby hash, with correctly typed values and symbolized keys
   which lets the caller show them as fractions (1/250) or as comparable numeric instances.
 * String values like "interop" and "serial number" are kept as strings
   (which preserves zero prefixes)
-
-## Installation
-
-You'll want to [install ExifTool](http://www.sno.phy.queensu.ca/~phil/exiftool/install.html), then
-
-```
-gem install exiftoolr
-```
-
-or add to your Gemfile:
-
-```
-gem 'exiftoolr'
-```
-
-and run ```bundle```.
+* Timestamps are attempted to be interpreted with correct timezones and sub-second resolution, if
+  the header contains that data.
+  Please note that EXIF headers don't always include a timezone offset, so we just adopt the system
+  timezone, which may, of course, be wrong.
 
 ## Usage
 
@@ -46,6 +36,11 @@ e.to_display_hash
 
 ### Multiple file support
 
+This gem supports Exiftool's multiget, which lets you fetch metadata for many files at once.
+
+This can be dramatically more efficient (like, 60x faster) than spinning up the ```exiftool```
+process for each file.
+
 Supply an array to the Exiftoolr initializer, then use ```.result_for```:
 
 ```ruby
@@ -72,8 +67,25 @@ Exiftoolr.new("Gemfile").errors?
 #=> true
 ```
 
+
+## Installation
+
+First [install ExifTool](http://www.sno.phy.queensu.ca/~phil/exiftool/install.html).
+
+Then, add this your Gemfile:
+
+    gem 'exiftoolr'
+
+and then run ```bundle```.
+
 ## Change history
 
+### 0.1.0
+
+* Better timestamp parsing—now both sub-second and timezone offsets are handled correctly
+* Switched to minitest-spec
+* Ruby 1.8.7 is no longer supported, hence the minor version uptick.
+
 ### 0.0.9
 
 * Explicitly added MIT licensing to the gemspec.

data/Rakefile

@@ -1,5 +1,17 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
 
-Rake::TestTask.new
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.files = ['lib/**/*.rb', 'README.md']
+end
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.libs.push "test"
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
 task :default => :test

data/exiftoolr.gemspec

@@ -1,26 +1,30 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "exiftoolr/version"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'exiftoolr/version'
 
-Gem::Specification.new do |s|
-  s.name        = "exiftoolr"
-  s.version     = Exiftoolr::VERSION
-  s.authors     = ["Matthew McEachen"]
-  s.email       = ["matthew-github@mceachen.org"]
-  s.homepage    = "https://github.com/mceachen/exiftoolr"
-  s.summary     = %q{Multiget ExifTool wrapper for ruby}
-  s.description = %q{Multiget ExifTool wrapper for ruby}
-  s.license       = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name        = 'exiftoolr'
+  spec.version     = Exiftoolr::VERSION
+  spec.authors     = ['Matthew McEachen']
+  spec.email       = %w(matthew-github@mceachen.org)
+  spec.homepage    = 'https://github.com/mceachen/exiftoolr'
+  spec.summary     = %q{Multiget ExifTool wrapper for ruby}
+  spec.description = %q{Multiget ExifTool wrapper for ruby}
+  spec.license     = 'MIT'
 
-  s.rubyforge_project = "exiftoolr"
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.requirements << 'ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)'
 
-  s.requirements << "ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)"
-
-  s.add_dependency "json"
-  s.add_development_dependency "rake"
+  spec.add_dependency 'json'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-great_expectations'
+  spec.add_development_dependency 'minitest-reporters' unless ENV['CI']
 end

data/lib/exiftoolr.rb

@@ -1,8 +1,6 @@
-require "exiftoolr/version"
-require "exiftoolr/result"
-
 require 'json'
 require 'shellwords'
+require 'exiftoolr/result'
 
 class Exiftoolr
   class NoSuchFile < StandardError ; end
@@ -23,14 +21,16 @@ class Exiftoolr
     File.expand_path(filename)
   end
 
-  def initialize(filenames, exiftool_opts = "")
+  def initialize(filenames, exiftool_opts = '')
     @file2result = {}
     filenames = [filenames] if filenames.is_a?(String)
     unless filenames.empty?
       escaped_filenames = filenames.collect do |f|
         Shellwords.escape(self.class.expand_path(f.to_s))
       end.join(" ")
-      cmd = "exiftool #{exiftool_opts} -j -coordFormat \"%.8f\" -dateFormat \"%Y-%m-%d %H:%M:%S\" #{escaped_filenames} 2> /dev/null"
+      # I'd like to use -dateformat, but it doesn't support timezone offsets properly,
+      # nor sub-second timestamps.
+      cmd = "exiftool #{exiftool_opts} -j -coordFormat \"%.8f\" #{escaped_filenames} 2> /dev/null"
       json = `#{cmd}`
       raise ExiftoolNotInstalled if json == ""
       JSON.parse(json).each do |raw|
@@ -67,7 +67,7 @@ class Exiftoolr
   private
 
   def first
-    raise InvalidArgument, "use #result_for when multiple filenames are used" if @file2result.size > 1
+    raise InvalidArgument, 'use #result_for when multiple filenames are used' if @file2result.size > 1
     @file2result.values.first
   end
 end

data/lib/exiftoolr/parser.rb

@@ -0,0 +1,63 @@
+require 'time'
+require 'date'
+require 'rational'
+
+class Exiftoolr
+  class Parser
+
+    WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
+    FRACTION_RE = /^(\d+)\/(\d+)$/
+
+    attr_reader :key, :display_key, :sym_key, :raw_value
+
+    def initialize(key, raw_value)
+      @key = key
+      @display_key = WORD_BOUNDARY_RES.inject(key) { |k, regex| k.gsub(regex, '\1 \2') }
+      @sym_key = display_key.downcase.gsub(' ', '_').to_sym
+      @raw_value = raw_value
+    end
+
+    def value
+      for_lat_long ||
+        for_date ||
+        for_fraction ||
+        raw_value
+    rescue StandardError => e
+      "Warning: Parsing '#{raw_value}' for attribute '#{key}' raised #{e.message}"
+    end
+
+    private
+
+    def for_lat_long
+      if sym_key == :gps_latitude || sym_key == :gps_longitude
+        value, direction = raw_value.split(" ")
+        if value =~ /\A\d+\.?\d*\z/
+          value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
+        end
+      end
+    end
+
+    def for_date
+      if raw_value.is_a?(String) && display_key =~ /\bdate\b/i
+        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') } ||
+          try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S.%L%z') } ||
+          try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S.%L') } ||
+          try_parse { Time.parse(raw_value) }
+      end
+    end
+
+    def try_parse
+      yield
+    rescue ArgumentError
+      nil
+    end
+
+    def for_fraction
+      if raw_value.is_a?(String)
+        scan = raw_value.scan(FRACTION_RE).first
+        v = Rational(*scan.map { |ea| ea.to_i }) unless scan.nil?
+      end
+    end
+  end
+end

data/lib/exiftoolr/result.rb

@@ -1,5 +1,4 @@
-require 'time'
-require 'rational'
+require 'exiftoolr/parser'
 
 class Exiftoolr
   class Result
@@ -27,51 +26,7 @@ class Exiftoolr
     end
 
     def errors?
-      self[:error] == "Unknown file type" || self[:warning] == "Unsupported file type"
-    end
-  end
-
-  class Parser
-    WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
-    FRACTION_RE = /^(\d+)\/(\d+)$/
-
-    attr_reader :display_key, :sym_key, :raw_value
-
-    def initialize(key, raw_value)
-      @display_key = WORD_BOUNDARY_RES.inject(key) { |k, regex| k.gsub(regex, '\1 \2') }
-      @sym_key = display_key.downcase.gsub(' ', '_').to_sym
-      @raw_value = raw_value
-    end
-
-    def value
-      for_lat_long ||
-        for_date ||
-        for_fraction ||
-        raw_value
-    rescue StandardError => e
-      v = "Warning: Parsing '#{raw_value}' for attribute '#{k}' raised #{e.message}"
-    end
-
-    private
-
-    def for_lat_long
-      if sym_key == :gps_latitude || sym_key == :gps_longitude
-        value, direction = raw_value.split(" ")
-        value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
-      end
-    end
-
-    def for_date
-      if raw_value.is_a?(String) && display_key =~ /\bdate\b/i
-        Time.parse(raw_value)
-      end
-    end
-
-    def for_fraction
-      if raw_value.is_a?(String)
-        scan = raw_value.scan(FRACTION_RE).first
-        v = Rational(*scan.collect { |ea| ea.to_i }) unless scan.nil?
-      end
+      self[:error] == 'Unknown file type' || self[:warning] == 'Unsupported file type'
     end
   end
 end

data/lib/exiftoolr/version.rb

@@ -1,3 +1,3 @@
 class Exiftoolr
-  VERSION = Gem::Version.new("0.0.9")
+  VERSION = Gem::Version.new('0.1.0')
 end

data/test/Canon 20D.jpg.yaml

@@ -1,223 +1,225 @@
---- 
-:color_temp_custom2: 4792
-:sensor_left_border: 84
-:flash_activity: 0
-:measured_rggb: 674 1024 1024 670
-:photo_effect: "Off"
-:digital_zoom: None
-:af_points_in_focus: 4
-:color_temp_shade: 7000
-:y_cb_cr_sub_sampling: YCbCr4:2:2 (2 1)
-:metering_mode: Evaluative
-:image_size: 3504x2336
-:canon_model_id: EOS 20D
-:bracket_mode: "Off"
-:camera_type: EOS Mid-range
-:exposure_mode: Auto
-:tone_curve: Standard
-:af_area_x_positions: 8 -555 571 -931 8 947 -555 571 8
-:color_tone: Normal
-:af_image_width: 3504
-:max_aperture: 5.6
-:aeb_bracket_value: 0
-:shutter_curtain_sync: 1st-curtain sync
-:aeb_sequence_auto_cancel: 0,-,+/Enabled
-:scale_factor35efl: 1.6
-:lens_af_stop_button: AF stop
-:add_original_decision_data: "Off"
-:thumbnail_image: (Binary data 11259 bytes)
-:flash_sync_speed_av: Auto
-:black_mask_right_border: 0
-:base_iso: 200
-:image_width: 3504
-:focal_plane_x_resolution: 2886.363636
-:exposure_program: Program AE
-:safety_shift_in_av_or_tv: Disable
-:measured_ev: 13.25
-:continuous_drive: Single
-:red_balance: 1.943842
+---
+:source_file: /Users/mrm/Dropbox/code/exiftoolr/test/Canon 20D.jpg
+:exif_tool_version: 9.31
 :file_name: Canon 20D.jpg
-:white_balance_blue: 0
-:lens: 17.0 - 85.0 mm
-:digital_gain: 0
-:macro_mode: Normal
-:wb_rggb_levels_flash: 2187 1023 1023 1333
-:menu_button_display_position: Previous (top if power off)
-:sensor_height: 2360
+:directory: /Users/mrm/Dropbox/code/exiftoolr/test
 :file_size: 2.9 MB
-:black_mask_top_border: 0
-:ettlii: Evaluative
-:af_area_width: 78
-:f_number: 9.0
-:directory: test
-:black_mask_bottom_border: 0
-:focal_plane_y_size: 15.37 mm
-:toning_effect: None
-:af_area_y_positions: 504 270 270 4 4 4 -262 -262 -496
-:focal_plane_y_resolution: 2885.805763
-:target_aperture: 9
-:focus_mode: One-shot AF
-:mirror_lockup: Disable
-:color_temp_flash: 6309
+:file_modify_date: 2012-02-23 05:22:17.000000000 +00:00
+:file_access_date: 2013-07-14 20:25:41.000000000 +00:00
+:file_inode_change_date: 2013-02-16 19:21:59.000000000 +00:00
+:file_permissions: rw-r--r--
+:file_type: JPEG
+:mime_type: image/jpeg
+:exif_byte_order: Little-endian (Intel, II)
 :make: Canon
-:set_function_when_shooting: Image replay
-:wb_bracket_value_gm: 0
-:exposure_time: !ruby/object:Rational 
+:model: Canon EOS 20D
+:orientation: Horizontal (normal)
+:x_resolution: 72
+:y_resolution: 72
+:resolution_unit: inches
+:modify_date: 2004-09-19 12:25:20.000000000 +00:00
+:y_cb_cr_positioning: Co-sited
+:exposure_time: !ruby/object:Rational
   denominator: 250
   numerator: 1
-:thumbnail_offset: 9728
-:canon_flash_mode: "Off"
-:serial_number: 0330113864
-:fov: 15.4 deg
-:thumbnail_image_valid_area: 0 159 7 112
-:af_point_selection_method: Normal
-:color_space: sRGB
-:original_decision_data_offset: 0
-:lens_id: Unknown 17-85mm
-:shutter_speed: !ruby/object:Rational 
+:f_number: 9.0
+:exposure_program: Program AE
+:iso: 200
+:exif_version: '0221'
+:date_time_original: 2004-09-19 12:25:20.000000000 +00:00
+:create_date: 2004-09-19 12:25:20.000000000 +00:00
+:components_configuration: Y, Cb, Cr, -
+:shutter_speed_value: !ruby/object:Rational
   denominator: 250
   numerator: 1
-:light_value: 13.3
-:superimposed_display: "On"
-:exposure_compensation: 0
-:orientation: Horizontal (normal)
-:components_configuration: Y, Cb, Cr, -
-:"shutter-ae_lock": AF/AE lock
-:focal_length: 85.0 mm
-:focal_length35efl: "85.0 mm (35 mm equivalent: 132.8 mm)"
-:bracket_shot_number: 0
-:model: Canon EOS 20D
 :aperture_value: 9.0
-:flash_guide_number: 0
-:long_exposure_noise_reduction2: "Off"
-:focal_plane_x_size: 23.04 mm
-:sequence_number: 0
-:long_exposure_noise_reduction: "Off"
-:white_balance: Auto
-:file_type: JPEG
+:flash: Off, Did not fire
+:focal_length: 85.0 mm
+:macro_mode: Normal
+:self_timer: 'Off'
+:quality: Fine
+:canon_flash_mode: 'Off'
+:continuous_drive: Single
+:focus_mode: One-shot AF
+:record_mode: JPEG
+:canon_image_size: Large
+:easy_mode: Manual
+:digital_zoom: None
+:contrast: '+1'
+:saturation: '+1'
+:sharpness: '+1'
+:metering_mode: Evaluative
+:focus_range: Not Known
 :canon_exposure_mode: Program AE
-:interop_version: "0100"
-:canon_image_width: 3504
-:color_temp_fluorescent: 3952
-:canon_firmware_version: Firmware 1.0.2
-:sharpness: "+1"
-:color_temp_auto: 4662
-:af_assist_beam: Emits
-:iso: 200
-:black_mask_left_border: 0
-:color_temp_custom1: 6163
-:focal_plane_resolution_unit: inches
-:wb_rggb_levels_custom1: 2095 1023 1023 1316
-:flash_bits: (none)
-:sensor_right_border: 3587
-:bracket_value: 0
-:canon_image_type: Canon EOS 20D
-:exif_version: "0221"
-:exif_image_width: 3504
-:encoding_process: Baseline DCT, Huffman coding
-:contrast: "+1"
-:file_modify_date: 2012-02-19 21:49:48 -08:00
-:white_balance_red: 0
-:auto_rotate: None
-:scene_capture_type: Standard
-:compression: JPEG (old-style)
-:sensor_red_level: 0
-:control_mode: Camera Local Control
-:sensor_width: 3596
-:shooting_mode: Program AE
 :lens_type: Unknown (-1)
-:sensor_blue_level: 0
-:file_permissions: rw-r--r--
-:num_af_points: 9
+:max_focal_length: 85 mm
+:min_focal_length: 17 mm
+:focal_units: 1/mm
+:max_aperture: 5.6
+:min_aperture: 32
+:flash_activity: 0
+:flash_bits: (none)
 :focus_continuous: Single
-:color_temp_tungsten: 3196
-:thumbnail_length: 11259
-:target_exposure_time: !ruby/object:Rational 
+:zoom_source_width: 0
+:zoom_target_width: 0
+:photo_effect: 'Off'
+:manual_flash_output: n/a
+:focal_type: Zoom
+:focal_plane_x_size: 23.04 mm
+:focal_plane_y_size: 15.37 mm
+:auto_iso: 100
+:base_iso: 200
+:measured_ev: 13.25
+:target_aperture: 9
+:target_exposure_time: !ruby/object:Rational
   denominator: 251
   numerator: 1
+:exposure_compensation: 0
+:white_balance: Auto
+:slow_shutter: None
+:sequence_number: 0
+:optical_zoom_code: n/a
+:flash_guide_number: 0
+:flash_exposure_comp: 0
+:auto_exposure_bracketing: 'Off'
+:aeb_bracket_value: 0
+:control_mode: Camera Local Control
+:measured_ev2: 13.5
+:bulb_duration: 0
+:camera_type: EOS Mid-range
+:auto_rotate: None
+:nd_filter: n/a
+:self_timer2: 0
+:canon_image_type: Canon EOS 20D
+:canon_firmware_version: Firmware 1.0.2
+:owner_name: unknown
+:serial_number: 0330113864
+:set_function_when_shooting: Image replay
+:long_exposure_noise_reduction: 'Off'
+:flash_sync_speed_av: Auto
+:shutter-ae_lock: AF/AE lock
+:af_assist_beam: Emits
+:exposure_level_increments: 1/3 Stop
+:flash_firing: Fires
+:iso_expansion: 'On'
+:aeb_sequence_auto_cancel: 0,-,+/Enabled
+:superimposed_display: 'On'
+:menu_button_display_position: Previous (top if power off)
+:mirror_lockup: Disable
+:af_point_selection_method: Normal
+:ettlii: Evaluative
+:shutter_curtain_sync: 1st-curtain sync
+:safety_shift_in_av_or_tv: Disable
+:lens_af_stop_button: AF stop
+:add_original_decision_data: 'Off'
+:canon_model_id: EOS 20D
+:num_af_points: 9
 :valid_af_points: 9
-:long_focal: 85 mm
-:wb_rggb_levels_daylight: 1995 1023 1023 1509
-:interop_index: R98 - DCF basic file (sRGB)
+:canon_image_width: 3504
 :canon_image_height: 2336
-:create_date: 2004-09-19 12:25:20 -07:00
-:wb_bracket_mode: "Off"
-:focal_units: 1/mm
+:af_image_width: 3504
+:af_image_height: 2336
+:af_area_width: 78
+:af_area_height: 78
+:af_area_x_positions: 8 -555 571 -931 8 947 -555 571 8
+:af_area_y_positions: 504 270 270 4 4 4 -262 -262 -496
+:af_points_in_focus: 4
+:thumbnail_image_valid_area: 0 159 7 112
 :serial_number_format: Format 2
-:short_focal: 17 mm
+:original_decision_data_offset: 0
+:file_number: 793-9390
+:bracket_mode: 'Off'
+:bracket_value: 0
+:bracket_shot_number: 0
+:long_exposure_noise_reduction2: 'Off'
+:wb_bracket_mode: 'Off'
+:wb_bracket_value_ab: 0
+:wb_bracket_value_gm: 0
+:filter_effect: None
+:toning_effect: None
+:tone_curve: Standard
+:sharpness_frequency: n/a
+:sensor_red_level: 0
+:sensor_blue_level: 0
+:white_balance_red: 0
+:white_balance_blue: 0
+:color_temperature: 4800
+:picture_style: None
+:digital_gain: 0
+:wb_shift_ab: 0
+:wb_shift_gm: 0
+:measured_rggb: 674 1024 1024 670
+:vrd_offset: 0
+:sensor_width: 3596
+:sensor_height: 2360
+:sensor_left_border: 84
 :sensor_top_border: 19
-:measured_ev2: 13.5
-:image_height: 2336
+:sensor_right_border: 3587
+:sensor_bottom_border: 2354
+:black_mask_left_border: 0
+:black_mask_top_border: 0
+:black_mask_right_border: 0
+:black_mask_bottom_border: 0
+:wb_rggb_levels_as_shot: 1973 1015 1015 1663
 :color_temp_as_shot: 4662
-:flash: Off, Did not fire
-:iso_expansion: "On"
-:record_mode: JPEG
-:flashpix_version: "0100"
+:wb_rggb_levels_auto: 1973 1023 1023 1663
+:color_temp_auto: 4662
+:wb_rggb_levels_daylight: 1995 1023 1023 1509
+:color_temp_daylight: 5200
+:wb_rggb_levels_shade: 2292 1023 1023 1267
+:color_temp_shade: 7000
+:wb_rggb_levels_cloudy: 2160 1023 1023 1373
+:color_temp_cloudy: 6000
 :wb_rggb_levels_tungsten: 1410 1023 1023 2408
-:blue_balance: 1.638424
-:sensor_bottom_border: 2354
-:circle_of_confusion: 0.019 mm
-:exif_byte_order: Little-endian (Intel, II)
+:color_temp_tungsten: 3196
+:wb_rggb_levels_fluorescent: 1797 1023 1023 2058
+:color_temp_fluorescent: 3952
+:wb_rggb_levels_flash: 2187 1023 1023 1333
+:color_temp_flash: 6309
+:wb_rggb_levels_custom1: 2095 1023 1023 1316
+:color_temp_custom1: 6163
+:wb_rggb_levels_custom2: 1912 1023 1023 1627
+:color_temp_custom2: 4792
+:color_tone: Normal
+:user_comment: ''
+:flashpix_version: '0100'
+:color_space: sRGB
+:exif_image_width: 3504
+:exif_image_height: 2336
+:interop_index: R98 - DCF basic file (sRGB)
+:interop_version: '0100'
+:focal_plane_x_resolution: 2886.363636
+:focal_plane_y_resolution: 2885.805763
+:focal_plane_resolution_unit: inches
 :custom_rendered: Normal
-:drive_mode: Single-frame Shooting
+:exposure_mode: Auto
+:scene_capture_type: Standard
+:compression: JPEG (old-style)
+:thumbnail_offset: 9728
+:thumbnail_length: 11259
+:image_width: 3504
+:image_height: 2336
+:encoding_process: Baseline DCT, Huffman coding
+:bits_per_sample: 8
 :color_components: 3
-:x_resolution: 72
-:exif_image_height: 2336
+:y_cb_cr_sub_sampling: YCbCr4:2:2 (2 1)
 :aperture: 9.0
-:easy_mode: Manual
-:nd_filter: n/a
-:exposure_level_increments: "1/3 Stop"
-:auto_exposure_bracketing: "Off"
-:af_area_height: 78
-:flash_firing: Fires
-:wb_rggb_levels_custom2: 1912 1023 1023 1627
-:self_timer2: 0
-:lens35efl: "17.0 - 85.0 mm (35 mm equivalent: 26.6 - 132.8 mm)"
-:mime_type: image/jpeg
-:wb_rggb_levels_shade: 2292 1023 1023 1267
-:canon_image_size: Large
-:hyperfocal_distance: 41.74 m
-:wb_rggb_levels_auto: 1973 1023 1023 1663
-:zoom_source_width: 0
-:auto_iso: 100
-:vrd_offset: 0
-:wb_shift_gm: 0
-:wb_rggb_levels_fluorescent: 1797 1023 1023 2058
-:color_temperature: 4800
-:wb_rggb_levels: 1973 1015 1015 1663
-:wb_shift_ab: 0
-:user_comment: ""
-:zoom_target_width: 0
-:quality: Fine
-:color_temp_cloudy: 6000
-:af_image_height: 2336
-:manual_flash_output: n/a
-:flash_exposure_comp: 0
-:wb_rggb_levels_cloudy: 2160 1023 1023 1373
-:source_file: test/Canon 20D.jpg
-:color_temp_daylight: 5200
-:sharpness_frequency: n/a
-:slow_shutter: None
-:modify_date: 2004-09-19 12:25:20 -07:00
-:bulb_duration: 0
-:bits_per_sample: 8
-:focus_range: Not Known
-:saturation: "+1"
-:focal_type: Zoom
-:wb_rggb_levels_as_shot: 1973 1015 1015 1663
-:min_aperture: 32
-:exif_tool_version: 8.59
-:y_resolution: 72
-:date_time_original: 2004-09-19 12:25:20 -07:00
-:shutter_speed_value: !ruby/object:Rational 
+:drive_mode: Single-frame Shooting
+:image_size: 3504x2336
+:lens: 17.0 - 85.0 mm
+:lens_id: Unknown 17-85mm
+:scale_factor35efl: 1.0
+:shooting_mode: Program AE
+:shutter_speed: !ruby/object:Rational
   denominator: 250
   numerator: 1
-:filter_effect: None
-:resolution_unit: inches
-:y_cb_cr_positioning: Co-sited
-:picture_style: None
-:file_number: 793-9390
-:self_timer: "Off"
-:wb_bracket_value_ab: 0
-:optical_zoom_code: n/a
-:owner_name: unknown
+:thumbnail_image: (Binary data 11259 bytes)
+:wb_rggb_levels: 1973 1015 1015 1663
+:blue_balance: 1.638424
+:circle_of_confusion: 0.030 mm
+:fov: 23.7 deg
+:focal_length35efl: '85.0 mm (35 mm equivalent: 85.6 mm)'
+:hyperfocal_distance: 26.91 m
+:lens35efl: '17.0 - 85.0 mm (35 mm equivalent: 17.1 - 85.6 mm)'
+:light_value: 13.3
+:red_balance: 1.943842