flickr_airlift 0.3.4 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/flickr_airlift/version.rb +1 -1
- data/lib/flickr_airlift.rb +7 -9
- metadata +2 -2
data/lib/flickr_airlift.rb
CHANGED
@@ -26,10 +26,9 @@ module FlickrAirlift
|
|
26
26
|
self.download
|
27
27
|
end
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
page_count = photos.pages
|
29
|
+
photos = flickr.photos.search(:user_id => user_id)
|
30
|
+
photo_count = photos.total
|
31
|
+
page_count = photos.pages
|
33
32
|
|
34
33
|
# non-pro users don't have 'Original' sizes available.
|
35
34
|
ranked_sizes = ['Original', 'Large', 'Medium']
|
@@ -44,13 +43,12 @@ module FlickrAirlift
|
|
44
43
|
flickr.photos.search(:user_id => user_id, :page => page_number).each_with_index do |photo, i|
|
45
44
|
|
46
45
|
photo_id = photo.id
|
47
|
-
info = flickr.photos.getInfo(:photo_id => photo_id)
|
48
46
|
downloadable_files = flickr.photos.getSizes(:photo_id => photo_id)
|
49
47
|
|
50
48
|
ranked_sizes.each do |size_name|
|
51
49
|
if df = downloadable_files.find { |downloadable_file| downloadable_file.label == size_name }
|
52
|
-
download_url
|
53
|
-
file_to_write
|
50
|
+
download_url = df.source
|
51
|
+
file_to_write = File.join(scraped_user, "#{photo_id}#{File.extname(download_url)}")
|
54
52
|
|
55
53
|
if File.exists?(file_to_write) && File.size(file_to_write) > 0
|
56
54
|
puts "** SKIPPING #{file_to_write} because it has already been downloaded"
|
@@ -106,8 +104,8 @@ module FlickrAirlift
|
|
106
104
|
end
|
107
105
|
|
108
106
|
else
|
109
|
-
frob
|
110
|
-
auth_url
|
107
|
+
frob = flickr.auth.getFrob
|
108
|
+
auth_url = FlickRaw.auth_url :frob => frob, :perms => "write"
|
111
109
|
|
112
110
|
puts " "
|
113
111
|
puts "opening your browser..."
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: flickr_airlift
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-07-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: launchy
|