flickru 0.0.8 → 0.0.9

data/README

@@ -3,11 +3,12 @@ Command-line tool that automatises photo/video uploads to Flickr.
 Entering 'flickru <directory>' in your command line, any photos under 'directory' (and subdirs)
 are uploaded to your Flickr account (interactively entered at the first time you start flickru).
 
-Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, and PNG.
+Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, PNG, and TIFF.
 Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
 
 The following Flickr metadata for photos (as well as videos) is set:
- (1) date-taken from the file (last) modification time
+ (1) date-taken from the file (last) modification time if no JPEG/TIFF
+     Exif metadata (Flickr directly sets photo date-taken by querying Exif)
  (2) private, visible by friends & family, hidden for public searches
  (3) safety level to safe
  (4) permission for friends & family to add comments to the photo and it's notes

data/bin/flickru

@@ -5,18 +5,21 @@
 require 'flickru'
 require 'flickru/version'
 
-photo_dir = File.expand_path ARGV[0]
-
 if ARGV[0] == "-h" or ARGV[0] == "--help"
   Flickru.usage
   exit
 elsif ARGV[0] == "-v" or ARGV[0] == "--version"
   puts Flickru::VERSION
   exit
-elsif ARGV.length > 1
+elsif ARGV.length != 1
   Flickru.usage
-  Flickru.die __LINE__, "wrong number of arguments: #{ARGV[1,ARGV.length]}"
-elsif photo_dir.nil? or photo_dir.empty?
+  Flickru.die __LINE__, "wrong number of arguments" +
+                        if ARGV.length != 0 then ": " + ARGV[1,ARGV.length].to_s
+                        else "" end
+end
+
+photo_dir = File.expand_path ARGV[0]
+if photo_dir.nil? or photo_dir.empty?
   Flickru.usage
   Flickru.die __LINE__, "missing photo directory"
 end

data/lib/flickru/file.rb

@@ -1,6 +1,8 @@
 # ruby
-require 'escape'
 require 'find'
+# gems
+require 'escape'
+require 'exifr'
 
 class File
 
@@ -44,6 +46,20 @@ class File
     end
   end
 
+  def File.date_taken file
+    attempt = 1
+    begin 
+       case attempt
+       when 1 then EXIFR::JPEG.new(file).date_time_original.strftime "%y-%m-%d %H:%M:%S"
+       when 2 then EXIFR::TIFF.new(file).date_time_original.strftime "%y-%m-%d %H:%M:%S"
+       else nil
+       end
+    rescue
+       attempt += 1
+       retry
+    end 
+  end
+
   def File.human_readable_size file_size
     if file_size < 1000
       file_size.to_s + " bytes"
@@ -58,7 +74,7 @@ class File
 
 private
 
-  IMAGE_EXTENSIONS = [".gif", ".jpg", ".jpeg", ".png"] # lowercase
+  IMAGE_EXTENSIONS = [".gif", ".jpg", ".jpeg", ".png", ".tiff"] # lowercase
   VIDEO_EXTENSIONS = [".mpeg", ".mpg", ".avi"] # lowercase
 
 end

data/lib/flickru/flickr.rb

@@ -49,7 +49,9 @@ module Flickr
         description = "This " + description + "\nDownload original file to play full video."
       end
 
-    date = File.mtime(photo).strftime("%y-%m-%d %H:%M:%S")
+    date = File.date_taken photo
+    if date.nil? then date = File.mtime(photo).strftime "%y-%m-%d %H:%M:%S" end
+
     loc  = Location.new photo
       Printer.show "uploading as " +
                    (loc.nil? ? "\"#{loc.name.black}\" (no location given)" : loc.to_s.black) +
@@ -75,7 +77,6 @@ module Flickr
     end
     flickr.photos.setTags :photo_id => id, :tags => ''
 
-# TODO date taken should be set only for photos/videos without non EXIF metadata
     flickr.photos.setDates :photo_id => id, :date_taken => date
     flickr.photos.setPerms :photo_id => id, :is_public => 0,
                            :is_friend => 1, :is_family => 1, # again! (mandatory) :P

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/spec/flickru_spec.rb

@@ -11,6 +11,10 @@ describe Flickru do
     Flickru.flickru "var/ts/tc_accents"
   end
 
+  it "setting date-taken metadata from Exif metadata if existing" do
+    Flickru.flickru "var/ts/tc_date_taken"
+  end
+
   it "different accuracies work case-insensitively" do
     Flickru.flickru "var/ts/tc_accuracies"
   end

metadata

@@ -2,7 +2,7 @@
 name: flickru
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jesus Pardillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colorize
@@ -35,71 +35,83 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: flickraw
+  name: exifr
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 1.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubygems-update
+  name: flickraw
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.8.11
+        version: 0.9.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: rubygems-update
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.4
+        version: 1.8.11
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: unicode_utils
+  name: simplecov
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 0.5.4
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: unicode_utils
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.7.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: |
   Command-line tool that automatises photo/video uploads to Flickr.
   
   Entering 'flickru <directory>' in your command line, any photos under 'directory' (and subdirs)
   are uploaded to your Flickr account (interactively entered at the first time you start flickru).
   
-  Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, and PNG.
+  Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, PNG, and TIFF.
   Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
   
   The following Flickr metadata for photos (as well as videos) is set:
-   (1) date-taken from the file (last) modification time
+   (1) date-taken from the file (last) modification time if no JPEG/TIFF
+       Exif metadata (Flickr directly sets photo date-taken by querying Exif)
    (2) private, visible by friends & family, hidden for public searches
    (3) safety level to safe
    (4) permission for friends & family to add comments to the photo and it's notes