squarepusher 0.0.2 → 0.0.3

data/bin/squarepusher

@@ -12,27 +12,82 @@ def fail(msg, code=1)
   exit code
 end
 
+
+actions = {}
+
+actions[:list_sets] = lambda do |client, args|
+  client.each_photoset do |pset|
+    puts Squarepusher.describe_photoset(pset)
+  end
+end
+
+actions[:grab_all_sets] = lambda do |client, args|
+  if not args
+    fail("expected: <output_dir>")
+  end
+  
+  client.each_photoset do |pset|
+    puts Squarepusher.describe_photoset(pset)
+    results = client.download_photoset(pset, output_dir)
+    puts results.inspect
+  end
+end
+
+actions[:grab_set] = lambda do |client, args|
+  if args.size != 2
+    fail("expected: <photoset_id> <output_dir>")
+  end
+  
+  pset_id, output_dir = args
+  pset = client.get_photoset(pset_id)
+  client.download_photoset(pset, output_dir)
+end
+
+actions[:find_set] = lambda do |client, args|
+  if args.size != 1
+    fail("expected: <photoset_id>")
+  end
+  
+  pset_id, output_dir = args
+  pset = client.get_photoset(pset_id)
+  puts Squarepusher.describe_photoset(pset)
+end
+
+
+def action_str(actions)
+  actions.keys.join(", ")
+end
+
+
 options = { :size => :original }
+args = nil
+action = nil
+client = nil
 OptionParser.new do |opts|
-  opts.banner = "USAGE: squarepusher [options] <api-key> <api-secret> <token> <output_dir>"
+  opts.banner = "USAGE: squarepusher [options] <api-key> <api-secret> <token> <action:(#{action_str(actions)})> [args]"
 
-  opts.on("-s", "--size SIZE", "secret") do |v|
+  # TODO: list sizing options
+  opts.on("-s", "--size SIZE", "size of photos to download (using flickr terminology)") do |v|
     options[:size] = v.to_sym
   end
     
   opts.parse!(ARGV)
   
-  if ARGV.size != 4
+  if ARGV.size < 4
     $stderr.puts opts
     exit 1
   end
+  
+  key, secret, token, action = ARGV.slice!(0...4)
+  args = ARGV
+  
+  action = action.to_sym
+  if not actions.has_key?(action)
+    $stderr.puts opts
+    exit 2
+  end
+  
+  client = Squarepusher::Client.new(key, secret, token, options)
 end
 
-key, secret, token, output_dir = ARGV
-
-client = Squarepusher::Client.new(key, secret, token, options)
-
-client.each_photoset do |pset|
-  puts pset.inspect
-  client.download_photoset(pset, output_dir)
-end
+actions[action].call(client, args || [])

data/lib/squarepusher.rb

@@ -5,8 +5,21 @@ FlickRawOptions = {}
 
 $fileutils = FileUtils::Verbose
 
+# TODO: detect "photo unavailable" and don't download image
+UNAVAILABLE_URL = 'http://l.yimg.com/g/images/photo_unavailable.gif'
+
+# TODO: keep track of failures
+
 module Squarepusher
   
+  class << self
+    
+    def describe_photoset(pset)
+      "#{pset.id} #{pset.title}"
+    end
+    
+  end
+
   class Client
     
     def initialize(key, secret, token, args={})
@@ -44,6 +57,10 @@ module Squarepusher
       end
     end
     
+    def get_photoset(pset_id)
+      flickr.photosets.getInfo(:photoset_id => pset_id)
+    end
+    
     def each_photoset
       flickr.photosets.getList.each do |pset|
         yield pset
@@ -54,6 +71,7 @@ module Squarepusher
       set_dir = File.join(output_dir, photoset.title.gsub(/\s+/, '-'))
       $fileutils.mkdir_p set_dir
       
+      results = {}
       photos = flickr.photosets.getPhotos(:photoset_id => photoset.id, :extras => "original_format,url_o")["photo"]
       photos.each do |p|
         # puts p.inspect
@@ -61,19 +79,37 @@ module Squarepusher
         
         url = @url_for_photo[p]
         
-        path = File.join(set_dir, "#{name}.jpg")
+        # TODO: only add .jpg suffix if it's not in the image name already
+        path = File.join(set_dir, "#{name}")
+        path << ".jpg" if not path =~ /.jpg$/
+        
         if File.exists?(path)
           puts "#{path} exists; skipping"
         else
-          download_image(url, path)
+          result = download_image(url, path)
+          if results.has_key?(result)
+            results[result] = results[result] + 1
+          else
+            results[result] = 1
+          end
         end
       end
+      results
     end
  
     private
     
-      def download_image(url, path)
-        puts "#{url} -> #{path}"
+      def download_image(url, path, args={})
+        if url == UNAVAILABLE_URL
+          redirects = args[:redirects]
+          msg = "#{url} unavailable"
+          msg << "; redirects: #{redirects}" if not redirects.nil?
+          puts msg
+          return :unvailable
+        end
+        
+        result = :unknown
+        # puts url
         uri = URI.parse(url)
         Net::HTTP.start(uri.host, uri.port) do |http|
           full_path = uri.request_uri
@@ -82,18 +118,24 @@ module Squarepusher
           # puts response.inspect
           case response
             when Net::HTTPError
+              result = :error
             when Net::HTTPFound
+              redirects = args[:redirects] || []
+              redirects << url
               location = response["location"]
               if not location =~ /^http.*/
                 location = "#{uri.scheme}://#{uri.host}:#{uri.port}#{location}"
               end
-              download_image(location, path)
+              download_image(location, path, :redirects => redirects)
             else
+              puts "#{url} -> #{path}"
               open(path, 'w') do |out|
                 out << response.body
               end
+              result = :success
           end
         end
+        return result
       end
       
   end

data/lib/squarepusher/version.rb

@@ -1,3 +1,3 @@
 module Squarepusher
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squarepusher
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - mhawthorne