flickru 0.0.15 → 0.1.0

data/README

@@ -7,9 +7,8 @@ Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, PNG, and T
 Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
 
 flickru automatically sets the following Flickr metadata:
- (1) date taken: if JPEG/TIFF Exif metadata is found, date is
-     extracted from them, otherwise flickru sets date to the last modification
-     time.
+ (1) date taken: file last-modification time, unless JPEG/TIFF Exif metadatum
+     'date_time_original' is found (Flickr understands it natively).
  (2) privacy policy: private, visible by friends & family, hidden for public
      searches
  (3) safety level: safe
@@ -18,7 +17,9 @@ flickru automatically sets the following Flickr metadata:
  (5) description: for videos longer than 90s (Flickr's longest allowed duration)
      but shorter than 500MB (Flickr's maximum permisible size), it will contain
      an annotation about its large duration.
- (6) title, geolocation, and accuracy: extracted from the parent directory name.
+ (6) title: extracted from the parent directory name
+ (7) geolocation & accuracy: extracted from the parent directory name, unless
+     JPEG/TIFF Exif GPS metadata is found (Flickr understands them natively).
 
 Before uploading photos, please, make sure that you have correctly named each
 photos parent directory according to the name format 'TITLE[@LOCATION[#PRECISION]]',
@@ -40,5 +41,5 @@ photoset is arranged by 'date taken' (older first).
 To see some examples on the directory structure recognised by flickru, please
 explore the subdirectories under 'var/ts'.
 
-Homepage: http://rubygems.org/gems/flickru
-GitHub: http://github.com/jesuspv/flickru
+GitHub  : http://github.com/jesuspv/flickru
+RubyGems: http://rubygems.org/gems/flickru

data/bin/flickru

@@ -2,6 +2,7 @@
 #flickru_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 #$LOAD_PATH.unshift(flickru_dir) unless $LOAD_PATH.include?(flickru_dir)
 
+# flickru
 require 'flickru'
 require 'flickru/version'
 
@@ -22,6 +23,9 @@ photo_dir = File.expand_path ARGV[0]
 if photo_dir.nil? or photo_dir.empty?
   Flickru.usage
   Flickru.die __LINE__, "missing photo directory"
+elsif not File.directory? photo_dir
+  Flickru.usage
+  Flickru.die __LINE__, "'#{ARGV[0]}' is not directory"
 end
 
 Flickru.flickru photo_dir

data/lib/flickru.rb

@@ -24,6 +24,11 @@ def Flickru.usage
   Printer.show "\n#{IO.read(readme)}"
 end
 
+def Flickru.die code, message
+  Printer.error "error:#{code}: #{message}"
+  exit 1
+end
+
 def Flickru.config_filename
   File.join ENV['HOME'], "." + File.basename(__FILE__, File.extname(__FILE__)) + "rc"
 end
@@ -89,8 +94,7 @@ def self.flickru photo_dir
               "  and better collection mosaics can be randomised."
 rescue Exception => e
   file_line = e.backtrace[0].split(':')
-  Printer.error "error:#{File.basename file_line[-3]}:#{file_line[-2]}: #{e.message}"
-  exit 1
+  Flickru.die "#{File.basename file_line[-3]}:#{file_line[-2]}", e.message
 end
 
 end # module Flickru

data/lib/flickru/file.rb

@@ -48,7 +48,7 @@ class File
 
   def File.date_taken file
     attempt = 1
-    begin 
+    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"
@@ -57,7 +57,31 @@ class File
     rescue
        attempt += 1
        retry
-    end 
+    end
+  end
+
+  def File.geotagged? file
+    attempt = 1
+    begin
+       case attempt
+       when 1 then
+          hash = EXIFR::JPEG.new(file).to_hash
+       when 2 then
+          hash = EXIFR::TIFF.new(file).to_hash
+       else return false
+       end
+    rescue
+       puts $!
+       attempt += 1
+       retry
+    end
+
+    lat     = hash.key? :gps_latitude
+    lon     = hash.key? :gps_longitude
+    lat_ref = hash.key? :gps_latitude_ref
+    lon_ref = hash.key? :gps_longitude_ref
+
+    lat and lon and lat_ref and lon_ref
   end
 
   def File.human_readable_size file_size

data/lib/flickru/flickr.rb

@@ -50,12 +50,19 @@ module Flickr
       end
 
     date = File.date_taken photo
-    if date.nil? then date = File.mtime(photo).strftime "%y-%m-%d %H:%M:%S" end
+    if date.nil?
+      date = File.mtime(photo).strftime "%y-%m-%d %H:%M:%S"
+      exif_has_date = false
+    else
+      exif_has_date = true
+    end
 
+    geotagged = File.geotagged? photo
     loc  = Location.new photo
       Printer.show "uploading " +
-                   (loc.nil? ? "#{loc.name.black} (no location given)" : loc.to_s) +
-                   " taken on #{date.black}... "
+         (geotagged ? "#{loc.name.black} (geotagged)"
+                    : (loc.nil? ? "#{loc.name.black} (no location given)" : loc.to_s)) \
+         + " taken on #{date.black} #{exif_has_date ? "(Exif)" : "(mtime)"}... "
     begin
       id = flickr.upload_photo photo, :title => UnicodeUtils.nfkc(loc.name), :is_public => 0,
                                       :description => description, :tags => UPLOADING_TAG,
@@ -77,14 +84,16 @@ module Flickr
     end
     flickr.photos.setTags :photo_id => id, :tags => ''
 
-    flickr.photos.setDates :photo_id => id, :date_taken => date
+    if not exif_has_date
+      flickr.photos.setDates :photo_id => id, :date_taken => date
+    end
     flickr.photos.setPerms :photo_id => id, :is_public => 0,
-                           :is_friend => 1, :is_family => 1, # again! (mandatory) :P
+                           :is_friend => 1, :is_family => 1, # again! (mandatory args) :P
                            :perm_comment => 1, :perm_addmeta => 0
 # TODO permission MAY be configurable
-    if not loc.nil?
+    if not geotagged and not loc.nil?
       flickr.photos.geo.setLocation :photo_id => id, :lat => loc.latitude,
-                                    :lon => loc.longitude, :accuracy => loc.accuracy                             
+                                    :lon => loc.longitude, :accuracy => loc.accuracy
     end
 
     Printer.success

data/lib/flickru/location.rb

@@ -5,6 +5,7 @@ require 'colorize'
 require 'escape'
 require 'open-uri'
 # flickru
+require 'flickru/file'
 require 'flickru/ruby'
 require 'flickru/string'
 
@@ -18,12 +19,12 @@ class Location
   def initialize photo
     dir   = File.basename File.dirname(photo)
     name, place, accuracy = Location.parse dir
-    raise RuntimeError, "unnamed location #{dir}" if name.nil?
+    raise RuntimeError, "#{dir}, name not provided" if name.nil?
     @name = name
     begin
-      @place    = place.nil? ? name : place
+      @place     = place.nil? ? name : place
       @latitude, @longitude = Location.locate @place
-      @accuracy = Location.s_to_accuracy(accuracy ? accuracy : DEFAULT_ACCURACY)
+      @accuracy  = Location.s_to_accuracy(accuracy ? accuracy : DEFAULT_ACCURACY)
     rescue RuntimeError
       raise if place
       raise RuntimeError, "location #{name} not found" if accuracy

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.0.15"
+    VERSION = "0.1.0"
   end
 end

data/spec/flickru_spec.rb

@@ -11,10 +11,6 @@ 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
@@ -23,10 +19,18 @@ describe Flickru do
     Flickru.flickru "var/ts/tc_collections"
   end
 
+  it "setting date-taken metadata from Exif metadata if existing" do
+    Flickru.flickru "var/ts/tc_date_taken"
+  end
+
   it "various filetypes available, skipping garbage" do
     Flickru.flickru "var/ts/tc_filetypes"
   end
 
+  it "ignoring location if photo is geotagged" do
+    Flickru.flickru "var/ts/tc_geotagging"
+  end
+
   it "large files work" do
     Flickru.flickru "var/ts/tc_large_files"
   end

metadata

@@ -2,7 +2,7 @@
 name: flickru
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jesus Pardillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -121,9 +121,8 @@ description: |
   Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
   
   flickru automatically sets the following Flickr metadata:
-   (1) date taken: if JPEG/TIFF Exif metadata is found, date is
-       extracted from them, otherwise flickru sets date to the last modification
-       time.
+   (1) date taken: file last-modification time, unless JPEG/TIFF Exif metadatum
+       'date_time_original' is found (Flickr understands it natively).
    (2) privacy policy: private, visible by friends & family, hidden for public
        searches
    (3) safety level: safe
@@ -132,7 +131,9 @@ description: |
    (5) description: for videos longer than 90s (Flickr's longest allowed duration)
        but shorter than 500MB (Flickr's maximum permisible size), it will contain
        an annotation about its large duration.
-   (6) title, geolocation, and accuracy: extracted from the parent directory name.
+   (6) title: extracted from the parent directory name
+   (7) geolocation & accuracy: extracted from the parent directory name, unless
+       JPEG/TIFF Exif GPS metadata is found (Flickr understands them natively).
   
   Before uploading photos, please, make sure that you have correctly named each
   photos parent directory according to the name format 'TITLE[@LOCATION[#PRECISION]]',
@@ -154,8 +155,8 @@ description: |
   To see some examples on the directory structure recognised by flickru, please
   explore the subdirectories under 'var/ts'.
   
-  Homepage: http://rubygems.org/gems/flickru
-  GitHub: http://github.com/jesuspv/flickru
+  GitHub  : http://github.com/jesuspv/flickru
+  RubyGems: http://rubygems.org/gems/flickru
 
 email: 
 - dev@jesuspardillo.com
@@ -214,6 +215,8 @@ files:
 - var/ts/tc_filetypes/Testing Collection/Video/mpg video.mpg
 - var/ts/tc_filetypes/Testing Collection/dummy.doc
 - var/ts/tc_filetypes/Testing Collection/dummy.txt
+- var/ts/tc_geotagging/Testing Collection/Chile/geotagged.jpg
+- var/ts/tc_geotagging/Testing Collection/No Location Provided/geotagged.jpg
 - var/ts/tc_large_files/Testing Collection/Too Large!/80MB-of-zeros.mpg.zip
 - var/ts/tc_locations/Testing Collection/Quebec#region/Quebec#region.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face/Troll Face.jpg
@@ -221,7 +224,7 @@ files:
 - var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376/Troll Face@38.356797,-0.474376.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Montreal/Troll Face@Montreal.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Quebec#region/Troll Face@Quebec#region.jpg
-homepage: http://rubygems.org/gems/flickru
+homepage: http://github.com/jesuspv/flickru
 licenses: []
 
 post_install_message: 
@@ -285,6 +288,8 @@ test_files:
 - var/ts/tc_filetypes/Testing Collection/Video/mpg video.mpg
 - var/ts/tc_filetypes/Testing Collection/dummy.doc
 - var/ts/tc_filetypes/Testing Collection/dummy.txt
+- var/ts/tc_geotagging/Testing Collection/Chile/geotagged.jpg
+- var/ts/tc_geotagging/Testing Collection/No Location Provided/geotagged.jpg
 - var/ts/tc_large_files/Testing Collection/Too Large!/80MB-of-zeros.mpg.zip
 - var/ts/tc_locations/Testing Collection/Quebec#region/Quebec#region.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face/Troll Face.jpg