nokaya 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8bc730be34c83aee0865c0e1c0fb269c0a15bf
-  data.tar.gz: a3fb50dab1917d381d01bb14b31a30ca0a39eab6
+  metadata.gz: 0f30bdf81f7a713f60c36acf4f78e993c306f0c5
+  data.tar.gz: 9f2037a5ae1f95ff17abf243e5077bc1124453c1
 SHA512:
-  metadata.gz: 340a8ff304170008a542177ae015ea2885ac6b86bc76affdc4b63dea96b794a0b42d9d8e78924cf9d3452caed08ca2d8400f81178794475f63391ba1c99990aa
-  data.tar.gz: f19a0c706273eeead12354c26a3ac58911911ed56809b24efdab5d55cf9a81b7adf746282973ee3ab2e61a1fa1de8a04615c67002d8b601c0692879311dd22bd
+  metadata.gz: 5f5012272855e7946c7219a5fa362f5546666e85e6e2002a420c9d6898cd4364dbdb2f42868f13e3b404db180b85d6990f7a7cc5981d3a9332b11405876e4536
+  data.tar.gz: 750f661bf436fb97147ed6a8f027bf72020aa0ab879a1d3f30e449ebae904006eae0972b12174274ac8396b8201c5c11dd03c439af4400db741a257cc7fb5360

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.5
+
+- Flickr album
+
 # 0.0.4
 
 - Tumblr

data/README.md

@@ -1,6 +1,6 @@
 # Nokaya
 
-CLI to download photos from several online services including Instagram, App.net and Favd. 
+CLI to download photos from several online services including Instagram, Imgur albums, Flickr albums, App.net, Tumblr...
 
 Mac OS X only for the time being.
 
@@ -50,6 +50,16 @@ Example:
 
 Downloads all images in the album.  
 
+### Flickr album
+
+`nokaya -fal url`
+
+Example:
+
+`nokaya -fal https://www.flickr.com/photos/ericdke/sets/72157644556227302/`
+
+Downloads all images in the album.  
+
 ### Favd
 
 `nokaya favd url` 

data/lib/nokaya/app.rb

@@ -14,7 +14,11 @@ module Nokaya
       nokaya = Getter.new options, :instagram, args
       page = nokaya.parse_page
       img_link = nokaya.get_basic page
-      download_and_save img_link, nokaya
+      begin
+        download_and_save img_link, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
     end
 
     desc "favd", 'Get the photo from a Favd page (nokaya favd url)'
@@ -24,7 +28,11 @@ module Nokaya
       nokaya = Getter.new options, :favd, args
       page = nokaya.parse_page
       img_link = nokaya.get_favd page
-      download_and_save img_link, nokaya
+      begin
+        download_and_save img_link, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
     end
 
     desc "adn", "Get the photo from a photos.app.net page (nokaya adn url)"
@@ -34,7 +42,11 @@ module Nokaya
       nokaya = Getter.new options, :adn, args
       page = nokaya.parse_page
       img_link = nokaya.get_basic page
-      download_and_save img_link, nokaya
+      begin
+        download_and_save img_link, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
     end
 
     desc "tumblr", "Get the photo from a Tumblr photo page (nokaya -t url)"
@@ -45,7 +57,11 @@ module Nokaya
       nokaya = Getter.new options, :tumblr, args
       page = nokaya.parse_page
       img_link = nokaya.get_basic page
-      download_and_save img_link, nokaya
+      begin
+        download_and_save img_link, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
     end
 
     desc "imgur_album", "Get all images from an Imgur album (nokaya -ial url)"
@@ -55,7 +71,25 @@ module Nokaya
       nokaya = Getter.new options, :imgur_album, args
       page = nokaya.parse_page
       img_links = nokaya.get_imgur_album page
-      download_album img_links, nokaya
+      begin
+        download_album img_links, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
+    end
+
+    desc "flickr_album", "Get all images from a Flickr album (nokaya -fal url)"
+    map "-fal" => :flickr_album
+    def flickr_album *args
+      abort Status.no_url if args.empty?
+      nokaya = Getter.new options, :flickr_album, args
+      page = nokaya.parse_page
+      img_links = nokaya.get_flickr_album page
+      begin
+        download_album img_links, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
     end
 
     private
@@ -68,14 +102,14 @@ module Nokaya
     end
 
     def download_album img_links, nokaya
-      puts "\nDownloading album at #{nokaya.url}...\n\n"
+      puts Status.downloading_album nokaya
       img_links.each do |link|
         parsed = URI.parse link
-        file = "#{Dir.home}/Downloads#{parsed.path}"
-        puts "Saving #{file}\n"
+        file = "#{Dir.home}/Downloads/#{parsed.path.split("/").last}"
+        puts Status.saving file
         Image.save_image(file, nokaya.get_image(link))
       end
-      puts "\nDone.\n\n"
+      puts Status.done
     end
 
   end

data/lib/nokaya/getter.rb

@@ -35,6 +35,12 @@ module Nokaya
       refs.each {|l| links << "http:#{l['href']}"}
       links
     end
+    def get_flickr_album page
+      refs = page.css('.pc_img')
+      links = []
+      refs.each {|l| links << l['data-defer-src']}
+      links
+    end
     def parse_page
       Nokogiri::HTML get_page_content
     end

data/lib/nokaya/status.rb

@@ -13,5 +13,20 @@ module Nokaya
     def self.no_url
       "\nYou have to specify a page URL.\n\n"
     end
+    def self.error
+      "\nAn unknown error happened.\n\n"
+    end
+    def self.canceled
+      "\nCanceled.\n\n"
+    end
+    def self.saving file
+      "Saving #{file}\n"
+    end
+    def self.done
+      "\nDone.\n\n"
+    end
+    def self.downloading_album nokaya
+      "\nDownloading album at #{nokaya.url}...\n\n"
+    end
   end
 end

data/lib/nokaya/version.rb

@@ -1,3 +1,3 @@
 module Nokaya
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/nokaya.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Eric Dejonckheere"]
   spec.email         = ["eric@aya.io"]
   spec.summary       = %q{Download photos from several online services.}
-  spec.description   = %q{CLI to download photos from several online services including Instagram. Mac OS X only for the time being.}
+  spec.description   = %q{CLI to download photos from several online services including Instagram, Imgur albums, Flickr albums, Tumblr, App,net, etc. Mac OS X only for the time being.}
   spec.homepage      = "http://github.com/ericdke/nokaya"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokaya
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Eric Dejonckheere
@@ -192,8 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: CLI to download photos from several online services including Instagram.
-  Mac OS X only for the time being.
+description: CLI to download photos from several online services including Instagram,
+  Imgur albums, Flickr albums, Tumblr, App,net, etc. Mac OS X only for the time being.
 email:
 - eric@aya.io
 executables: