flickr_airlift 0.3.5 → 0.4.0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.DS_Store
 .bundle
 .redcar
 .config

data/README.textile

@@ -12,13 +12,11 @@ h3. Requirements
 
 h1. Flickr Airlift
 
-Flickr Airlift is a command line tool to scrape all of a user's photos.
-It comes with the bin flickr_airlift which will dump all photos in a directory
-named after the user.
+Flickr Airlift is a command line tool to scrape *any set* _or_ *all photos in the photostream" of a user.
+It comes with the bin flickr_airlift.
 
 h2. Usage
 
-Relax slim...use the @flickr_airlift@ bin and let the app have its way
 Here's an "example session":https://gist.github.com/0cd071320f022c06dc23
 
 ------------------------------------------------------------------------------------
@@ -30,7 +28,6 @@ By default they will all be public.
 
 h2. Usage
 
-Relax slim...use the @flickr_uplift@ bin and let the app have its way
 Here's an "example session":https://gist.github.com/61c9b299fdbae112dc26
 
 This product uses the Flickr API but is not endorsed or certified by Flickr.

data/flickr_airlift.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('launchy',  '0.4.0')
   gem.add_dependency('flickraw', '0.8.4')
+  gem.add_dependency('highline', '1.6.11')
 
   gem.rubyforge_project = 'nowarning'
 end

data/lib/flickr_airlift/downloader.rb

@@ -0,0 +1,50 @@
+require 'fileutils'
+
+module FlickrAirlift
+  module Downloader
+
+    def self.download(user, set = nil)
+      # non-pro users don't have 'Original' sizes available.
+      ranked_sizes  = ['Original', 'Large', 'Medium']
+
+      username    = user.username
+      path        = set.nil? ? username : File.join(username, set.title)
+      user_id     = user.id
+      photos      = set.nil? ? flickr.photos.search(:user_id => user_id) : flickr.photosets.getPhotos(:photoset_id => set.id)
+      photo_count = photos.total
+      page_count  = photos.pages
+
+      # Downloading
+      puts "#{username} has #{photo_count} pictures"
+      puts "* Creating directory: '#{path}'"
+      FileUtils.mkdir_p(path) unless File.directory?(path)
+
+      (1..page_count.to_i).each do |page_number|
+        puts "* PAGE #{page_number} of #{page_count}"
+        iterate_over = set.nil? ? flickr.photos.search(:user_id => user_id, :page => page_number) : photos.photo
+
+        iterate_over.each_with_index do |photo, i|
+
+          photo_id            = photo.id
+          downloadable_files  = flickr.photos.getSizes(:photo_id => photo_id)
+
+          ranked_sizes.each do |size_name|
+            if df = downloadable_files.find { |downloadable_file| downloadable_file.label == size_name }
+              download_url  = df.source
+              file_to_write = File.join(path, "#{photo_id}#{File.extname(download_url)}")
+
+              if File.exists?(file_to_write) && File.size(file_to_write) > 0
+                puts "** SKIPPING #{file_to_write} because it has already been downloaded"
+              else
+                puts "** Downloading #{i+1}: #{photo.title} (#{size_name}) from #{download_url}"
+                File.open(file_to_write, 'wb') { |file| file.puts Net::HTTP.get_response(URI.parse(download_url)).body }
+              end
+              break
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/flickr_airlift/version.rb

@@ -1,3 +1,3 @@
 module FlickrAirlift
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/flickr_airlift.rb

@@ -1,8 +1,10 @@
 require "flickr_airlift/version"
+require "flickr_airlift/downloader"
 require 'flickraw'
 require 'net/http'
 require 'cgi'
 require 'launchy'
+require 'highline/import'
 require 'yaml'
 
 module FlickrAirlift
@@ -20,47 +22,34 @@ module FlickrAirlift
       scraped_user = scraped_user.strip
 
       begin
-        user_id = flickr.people.findByUsername(:username => scraped_user).id
+        user    = flickr.people.findByUsername(:username => scraped_user)
+        user_id = user.id
       rescue Exception => e
         puts "Hmmmm - unknown user - make sure to use the user's full handle - not the one in the URL. (example: 'Fast & Bulbous' not 'fastandbulbous')"
         self.download
       end
 
-      photos      = flickr.photos.search(:user_id => user_id)
-      photo_count = photos.total
-      page_count  = photos.pages
-
-      # non-pro users don't have 'Original' sizes available.
-      ranked_sizes  = ['Original', 'Large', 'Medium']
-
-      # Downloading
-      puts "#{scraped_user} has #{photo_count} pictures"
-      puts "* Creating folder named '#{scraped_user}'"
-      Dir.mkdir(scraped_user) unless File.directory?(scraped_user)
-
-      (1..page_count.to_i).each do |page_number|
-        puts "* PAGE #{page_number} of #{page_count}"
-        flickr.photos.search(:user_id => user_id, :page => page_number).each_with_index do |photo, i|
-
-          photo_id            = photo.id
-          downloadable_files  = flickr.photos.getSizes(:photo_id => photo_id)
-
-          ranked_sizes.each do |size_name|
-            if df = downloadable_files.find { |downloadable_file| downloadable_file.label == size_name }
-              download_url  = df.source
-              file_to_write = File.join(scraped_user, "#{photo_id}#{File.extname(download_url)}")
-
-              if File.exists?(file_to_write) && File.size(file_to_write) > 0
-                puts "** SKIPPING #{file_to_write} because it has already been downloaded"
-              else
-                puts "** Downloading #{i+1}: #{photo.title} (#{size_name}) from #{download_url}"
-                File.open(file_to_write, 'wb') { |file| file.puts Net::HTTP.get_response(URI.parse(download_url)).body }
-              end
-              break
-            end
+      # Grab sets
+      photo_sets = flickr.photosets.getList(:user_id => user_id).sort_by(&:title)
+
+      choose do |menu|
+        menu.prompt = "What do you want to download?"
+
+        menu.choice("~ Entire Photostream ~") do
+          FlickrAirlift::Downloader.download(user)
+          exit
+        end
+
+        photo_sets.each do |photoset|
+          menu.choice(photoset.title) do
+            FlickrAirlift::Downloader.download(user, photoset)
+            exit
           end
         end
+
+        menu.choice("Quit")             { exit }
       end
+
     rescue FlickRaw::FailedResponse => e
       puts e.msg
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr_airlift
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -43,6 +43,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 description: A Command-Line tool for scraping any user's original photos OR uploading
   all photos from a given directory
 email:
@@ -61,6 +77,7 @@ files:
 - bin/flickr_uplift
 - flickr_airlift.gemspec
 - lib/flickr_airlift.rb
+- lib/flickr_airlift/downloader.rb
 - lib/flickr_airlift/version.rb
 homepage: https://github.com/nodanaonlyzuul/flickr_airlift
 licenses: []