flickru 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82254f660673608d3200decbd1d63d62dc9c561
-  data.tar.gz: f4739986f5c5ee1fb8dec91d7b3af67d2d30697e
+  metadata.gz: 72e16e0762f4fd5e9f5f7273a3ac3d709b7fc4c5
+  data.tar.gz: 9fc37f4bbd55c749d8e02f79700ef2e7e8613a43
 SHA512:
-  metadata.gz: e6a1d84080fce3b8a0a38d19ae841ca43fc0a4130f1f8db4e3a9f22b4d571822e5f18b12a61ef205b1578c6629a11fd1fb78a4509aff627a5118dcc97c8d851e
-  data.tar.gz: c9cbcf2d8d1e36dca6088e9f389034f6c508b5dd7eeacf5201e469369d87a2060ad05906f7c80ae0c27af5f8795e8e6fde1f914201ea2f4ce77eb27d2eba46fa
+  metadata.gz: c839dc78d9da45abd827527d74afabc9f4766dc7239fbd037fe818e36a8ac90e4da6571d491bcbfa213f1536ca2fcd26e9a7b250d0a1bc9023d8faf24c09bf14
+  data.tar.gz: b714bb96e49bc53fde01e577a26af9394107ee012b57222c25ccbd9b3cdd1894646a274215908f1e232d7327dfad8b6bc28c697f21904c09554eb0803c38de67

data/bin/flickru

@@ -6,12 +6,17 @@
 require 'flickru'
 require 'flickru/version'
 
+rmFlag = false
+
 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[0] == "-r" or ARGV[0] == "--rm"
+  rmFlag = true
+  ARGV.shift
 elsif ARGV.length != 1
   Flickru.usage
   Flickru.die __LINE__, "wrong number of arguments" +
@@ -28,4 +33,4 @@ elsif not File.directory? photo_dir
   Flickru.die __LINE__, "'#{ARGV[0]}' is not directory"
 end
 
-Flickru.flickru photo_dir
+Flickru.flickru rmFlag, photo_dir

data/lib/flickru.rb

@@ -18,8 +18,12 @@ module Flickru
 def Flickru.usage
   filename = File.basename __FILE__
   Printer.show "#{filename} -- Flickr upload command-line automator\n"
-  Printer.show "usage: #{filename} [-h|--help|-v|--version] <photo directory>\n"
+  Printer.show "usage: #{filename} [<options>] <photo directory>\n"
   Printer.show "example: #{filename} my_photos\n"
+  Printer.show "options:\n"
+  Printer.show "  -h, --help      show help\n"
+  Printer.show "  -r, --rm        delete each photo when uploaded\n"
+  Printer.show "  -v, --version   show version\n"
   readme = File.expand_path(File.join(File.dirname(__FILE__), '..', 'README'))
   Printer.show "\n#{IO.read(readme)}"
 end
@@ -57,7 +61,7 @@ rescue
   raise RuntimeError, "unable to write configuration file #{config_filename}"
 end
 
-def self.flickru photo_dir
+def self.flickru rmFlag, photo_dir
   begin
     Flickru.read_config
   rescue RuntimeError
@@ -74,15 +78,23 @@ def self.flickru photo_dir
   photos.sort.each do |photo|
       Printer.info "file '#{File.join File.basename(File.dirname(photo)), File.basename(photo)}' under process"
     begin
+      retries ||= 0
       photo_id = Flickr.upload_photo photo
       photoset_ids << Flickr.classify(photo, photo_id)
-    rescue ArgumentError || Errno::ENOENT || Errno::EAGAIN || FlickRaw::FailedResponse
-      Printer.failure "#{photo}: #{$!}"
+    rescue ArgumentError || Errno::ENOENT || Errno::EAGAIN || Errno::EPIPE || FlickRaw::FailedResponse
+      if (retries += 1) < 3
+        Printer.warn "retrying #{photo}: #{$!}"
+        sleep (Math.exp retries)
+        retry
+      else
+        Printer.failure "#{photo}: #{$!}"
+      end
     end
     journey.take File.size(photo)
     Printer.info "#{File.human_readable_size journey.progress} uploaded, " +
                  "#{File.human_readable_size journey.distance} remaining. " +
                  "ETA: #{Printer.human_readable_seconds journey.eta}" if journey.eta > 0
+    File.delete photo if rmFlag
   end
 
   photoset_ids.each do |set_id|
@@ -93,7 +105,7 @@ def self.flickru photo_dir
               "  better primary photos for your sets have been uploaded,\n" +
               "  and better collection mosaics can be randomised."
 rescue Exception => e
-  file_line = e.backtrace[0].split(':')
+  file_line = e.backtrace.empty? ? "?" : e.backtrace[0].split(':')
   Flickru.die "#{File.basename file_line[-3]}:#{file_line[-2]}", e.message
 end
 

data/lib/flickru/file.rb

@@ -90,9 +90,9 @@ class File
     elsif file_size < 1000000
       (file_size / 1000).to_s + "KB"
     elsif file_size < 1000000000
-      (file_size / 1000000).to_s + "MB"
+      (file_size / 100000).to_s + "MB"
     else
-      (file_size / 1000000000).to_s + "GB"
+      (file_size / 1000000000.0).round.to_s + "GB" # with float division
     end
   end
 

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickru
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jesus Pardillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,7 +236,8 @@ executables:
 - flickru
 - geowiki
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README
 files:
 - README
 - bin/flickru
@@ -314,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="