flickr_airlift 0.3.0 → 0.3.2

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.redcar
 .config
 .yardoc
 .rvmrc
@@ -15,4 +16,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp

data/lib/flickr_airlift/version.rb

@@ -1,3 +1,3 @@
 module FlickrAirlift
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/flickr_airlift.rb

@@ -15,14 +15,24 @@ module FlickrAirlift
 
       # Prompt
       puts "Exactly who's photos would you like to archive?:"
+      
       scraped_user = STDIN.gets
-      scraped_user = scraped_user.strip
-
-      # Find
-      user_id       = flickr.people.findByUsername(:username => scraped_user).id
+      scraped_user = scraped_user.strip          
+      
+      begin
+        user_id = flickr.people.findByUsername(:username => scraped_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"
@@ -33,17 +43,24 @@ module FlickrAirlift
         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
-          info               = flickr.photos.getInfo(:photo_id => photo_id)
-          photo_size_objects = flickr.photos.getSizes(:photo_id => photo_id)
-
-          download_url = flickr.photos.getSizes(:photo_id => photo_id).find{|size| size.label == "Original"}.source
-
-          puts "** Downloading #{i+1}: #{photo.title} from #{download_url}"
-          File.open(File.join(scraped_user, "#{info.title}#{File.extname(download_url)}"), 'wb') do |file|
-            file.puts Net::HTTP.get_response(URI.parse(download_url)).body
+          photo_id            = photo.id
+          info                = flickr.photos.getInfo(: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)
+                puts "** SKIPPING #{file_to_write} because it exists"
+              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
 
@@ -78,9 +95,17 @@ module FlickrAirlift
     FlickRaw.shared_secret  = "405549bcec106815"
 
     if File.exists?(auth_file)
-      puts "authenticating through #{auth_file}...if this fails - delete this file"
-      data = YAML.load_file(auth_file)
-      auth = flickr.auth.checkToken :auth_token => data["api_token"]
+      
+      data = YAML.load_file(auth_file)      
+
+      begin
+        auth = flickr.auth.checkToken :auth_token => data["api_token"]  
+      rescue Exception => e
+        puts "These was a problem with the credentials in #{auth_file}"
+        puts "Delete the file and try again."
+        exit
+      end
+      
     else
       frob                    = flickr.auth.getFrob
       auth_url                = FlickRaw.auth_url :frob => frob, :perms => "write"
@@ -98,7 +123,7 @@ module FlickrAirlift
       auth  = flickr.auth.getToken :frob => frob
       login = flickr.test.login
 
-      puts auth.token
+      puts "Writing credentials to #{auth_file}"
       data = {}
       data["api_token"] = auth.token
       File.open(auth_file, "w"){|f| YAML.dump(data, f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr_airlift
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy