nokaya 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3dcc28605b1fb6c28e8d8bd198c0aacbf58d2c
-  data.tar.gz: 38f1f67e0b46b162860c1f221ccd9be4a115926c
+  metadata.gz: 8c1c8545782a4967ed49ae24e36af26da579d3f2
+  data.tar.gz: b9e882f85dfa3d2d5a04c79473b7028e6241660b
 SHA512:
-  metadata.gz: 1c32b568b79340c2063de1ff6f21ebf6affee813d874c5aeed2e8ba07f27358ce06707440b6ffdc283cd95b88311035a6c7a9863af9ef2f6b0094fa7f7ec4721
-  data.tar.gz: fd25392b2b1e9250769c4366ead047ac529a9f5e1691f422125e14b6d8e71df992e68d9781d22a45b60680741d7154d7957940a4c72f5bea0e65261d479bcdd1
+  metadata.gz: f7e0c47f94bd19ab9eed7a04e84b732ae4e8118bcf6e47ff385f68164efcd67549d0c17f2d874ad78338a84e5bd017073b116ba0cb3df80f6d7b2a8fe9464d61
+  data.tar.gz: d22521d67712ecc3e6d178f01662c9306a591e1ea4aea36d8836f409325e74b8954c14f178431fa4dd057487fe931bc2de57f2233f9750daa49f79e327e1f4c6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.7
+
+- Download each album in a unique folder
+- Photo.net
+- Deviantart
+- Imageshack user gallery
+
 # 0.0.6
 
 - Refactoring

data/README.md

@@ -1,6 +1,6 @@
 # Nokaya
 
-CLI to download photos from several online services including Instagram, Imgur albums, Flickr albums, App.net, Tumblr...
+CLI to download photos from several online services including Instagram, Imgur albums, Flickr albums, App.net, Tumblr pages, Photo.net, Deviantart, etc.
 
 Mac OS X only for the time being.
 
@@ -74,6 +74,36 @@ Example:
 
 Downloads all images in the album.  
 
+### Photo.net page
+
+`nokaya -pnet url`
+
+Example:
+
+`nokaya -pnet http://photo.net/gallery/photocritique/filter\?period\=365\&rank_by\=sum\&category\=Architecture\&store_prefs_p\=0`
+
+Downloads all images in the page.  
+
+### Deviantart gallery
+
+`nokaya -dart url`
+
+Example:
+
+`nokaya -dart http://www.deviantart.com/photography/nature/waterscapes/`
+
+Downloads all images in the gallery. 
+
+### Imageshack user gallery
+
+`nokaya -ishu url`
+
+Example:
+
+`nokaya -ishu https://imageshack.com/user/ToddGilbert`
+
+Downloads all images in the user gallery.  
+
 ### Favd
 
 `nokaya favd url` 

data/lib/nokaya/app.rb

@@ -6,7 +6,7 @@ module Nokaya
     require_relative 'image'
     require_relative 'status'
 
-    desc "instagram", "Get the main photo from an Instagram page (nokaya -i url)"
+    desc "instagram", "Get the original picture from an Instagram page (nokaya -i url)"
     map "-i" => :instagram
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def instagram *args
@@ -15,7 +15,7 @@ module Nokaya
       basic nokaya
     end
 
-    desc "favd", 'Get the photo from a Favd page (nokaya favd url)'
+    desc "favd", 'Get the picture from a Favd page (nokaya favd url)'
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def favd *args
       check_args args
@@ -25,7 +25,7 @@ module Nokaya
       save_pic img_link, nokaya
     end
 
-    desc "adn", "Get the photo from a photos.app.net page (nokaya adn url)"
+    desc "adn", "Get the picture from a photos.app.net page (nokaya adn url)"
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def adn *args
       check_args args
@@ -33,7 +33,7 @@ module Nokaya
       basic nokaya
     end
 
-    desc "tumblr", "Get the photo from a Tumblr post (nokaya -tu url)"
+    desc "tumblr", "Get the picture from a Tumblr post (nokaya -tu url)"
     map "-tu" => :tumblr
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def tumblr *args
@@ -42,7 +42,7 @@ module Nokaya
       basic nokaya
     end
 
-    desc "tumblr_album", "Get all images from a Tumblr page (nokaya -tal url)"
+    desc "tumblr_album", "Get all pictures from a Tumblr page (nokaya -tal url)"
     map "-tal" => :tumblr_album
     def tumblr_album *args
       check_args args
@@ -52,7 +52,7 @@ module Nokaya
       save_album img_links, nokaya
     end
 
-    desc "imgur_album", "Get all images from an Imgur album (nokaya -ial url)"
+    desc "imgur_album", "Get all pictures from an Imgur album (nokaya -ial url)"
     map "-ial" => :imgur_album
     def imgur_album *args
       check_args args
@@ -62,7 +62,7 @@ module Nokaya
       save_album img_links, nokaya
     end
 
-    desc "flickr_album", "Get all images from a Flickr album (nokaya -fal url)"
+    desc "flickr_album", "Get all pictures from a Flickr album (nokaya -fal url)"
     map "-fal" => :flickr_album
     def flickr_album *args
       check_args args
@@ -72,6 +72,36 @@ module Nokaya
       save_album img_links, nokaya
     end
 
+    desc "photonet", "Get all pictures from a Photo.net page (nokaya -pnet url)"
+    map "-pnet" => :photonet
+    def photonet *args
+      check_args args
+      nokaya = Getter.new options, :photonet, args
+      page = nokaya.parse_page
+      img_links = nokaya.get_photonet_album page
+      save_album img_links, nokaya
+    end
+
+    desc "deviantart", "Get all pictures from a Deviantart gallery (nokaya -dart url)"
+    map "-dart" => :deviantart
+    def deviantart *args
+      check_args args
+      nokaya = Getter.new options, :deviantart, args
+      page = nokaya.parse_page
+      img_links = nokaya.get_deviantart page
+      save_album img_links, nokaya
+    end
+
+    desc "imageshack_user", "Get all pictures from an Imageshack user gallery (nokaya -ishu url)"
+    map "-ishu" => :imageshack_user
+    def imageshack_user *args
+      check_args args
+      nokaya = Getter.new({name: "#{args[0].split("/").last}"}, :imageshack_user, args)
+      page = nokaya.parse_page
+      img_links = nokaya.get_imageshack_user page
+      save_album img_links, nokaya
+    end
+
     private
 
     def basic nokaya
@@ -92,10 +122,16 @@ module Nokaya
     end
 
     def download_album img_links, nokaya
-      puts Status.downloading_album nokaya
+      if nokaya.options[:name]
+        dir = "#{Dir.home}/Downloads/#{nokaya.type}-#{nokaya.options[:name]}"
+      else
+        dir = "#{Dir.home}/Downloads/#{nokaya.type}-#{Time.now.to_i}"
+      end
+      puts Status.downloading_album dir
+      Dir.mkdir dir
       img_links.each do |link|
         parsed = URI.parse link
-        file = "#{Dir.home}/Downloads/#{parsed.path.split("/").last}"
+        file = "#{dir}/#{parsed.path.split("/").last}"
         puts Status.saving file
         Image.save_image(file, link)
       end
@@ -112,6 +148,7 @@ module Nokaya
 
     def save_album img_links, nokaya
       begin
+        abort Status.no_can_do if img_links.empty?
         download_album img_links, nokaya
       rescue Interrupt
         abort Status.canceled

data/lib/nokaya/getter.rb

@@ -22,6 +22,26 @@ module Nokaya
     def get_favd page
       page.css('#largeImage')[0]['src']
     end
+    def get_deviantart page
+      refs = page.css('a.thumb')
+      links = []
+      refs.each {|li| links << li['data-super-img']}
+      links
+    end
+    def get_imageshack_user page
+      refs = page.css('a.hero-wrapper')
+      temp = []
+      links = []
+      refs.each {|li| temp << "https://imageshack.com#{li['href']}"}
+      puts Status.toresolve temp.length
+      temp.each do |p|
+        puts Status.resolving p
+        picpage = Nokogiri::HTML(open p)
+        ref = picpage.css('figure.image img')
+        links << "http:#{ref[0]['src']}"
+      end
+      links
+    end
     def get_imgur_album page
       refs = page.css('#imagelist .posts .post a')
       links = []
@@ -29,7 +49,7 @@ module Nokaya
       links
     end
     def get_tumblr_album page
-      queries = ['img.photo', '.post .photo a img', '.entry img', 'article img', '.image img', '.item_content img', 'img.post-image', '.box img', '#allposts img', '.media img', '.wide img', '.big img', '.large img', '.gallery img', '.photos img', 'img']
+      queries = ['img.photo', '.post .photo a img', '.entry img', 'article img', '.image img', '.item_content img', 'img.post-image', '.box img', '#allposts img', '.media img', '.wide img', '.big img', '.large img', '.gallery img', '.photos img', '.content img', 'img']
       queries.each do |query|
         @refs = page.css query
         next if @refs.empty?
@@ -50,6 +70,14 @@ module Nokaya
       refs.each {|l| links << l['data-defer-src']}
       links
     end
+    def get_photonet_album page
+      refs = page.css '.trp-top a'
+      links = []
+      refs.each do |lin|
+        links << "http://gallery.photo.net/photo/#{lin['href'].split("=").last}-lg.jpg"
+      end
+      links
+    end
     def parse_page
       Nokogiri::HTML(open @args.url)
     end

data/lib/nokaya/status.rb

@@ -25,8 +25,14 @@ module Nokaya
     def self.done
       "\nDone.\n\n"
     end
-    def self.downloading_album nokaya
-      "\nDownloading album at #{nokaya.url}...\n\n"
+    def self.downloading_album dir
+      "\nDownloading album at #{dir}/...\n\n"
+    end
+    def self.toresolve number
+      "\n#{number} links to resolve.\n\n"
+    end
+    def self.resolving p
+      "Resolving #{p}...\n"
     end
   end
 end

data/lib/nokaya/version.rb

@@ -1,3 +1,3 @@
 module Nokaya
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokaya
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Dejonckheere