nokaya 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f30bdf81f7a713f60c36acf4f78e993c306f0c5
-  data.tar.gz: 9f2037a5ae1f95ff17abf243e5077bc1124453c1
+  metadata.gz: 3a3dcc28605b1fb6c28e8d8bd198c0aacbf58d2c
+  data.tar.gz: 38f1f67e0b46b162860c1f221ccd9be4a115926c
 SHA512:
-  metadata.gz: 5f5012272855e7946c7219a5fa362f5546666e85e6e2002a420c9d6898cd4364dbdb2f42868f13e3b404db180b85d6990f7a7cc5981d3a9332b11405876e4536
-  data.tar.gz: 750f661bf436fb97147ed6a8f027bf72020aa0ab879a1d3f30e449ebae904006eae0972b12174274ac8396b8201c5c11dd03c439af4400db741a257cc7fb5360
+  metadata.gz: 1c32b568b79340c2063de1ff6f21ebf6affee813d874c5aeed2e8ba07f27358ce06707440b6ffdc283cd95b88311035a6c7a9863af9ef2f6b0094fa7f7ec4721
+  data.tar.gz: fd25392b2b1e9250769c4366ead047ac529a9f5e1691f422125e14b6d8e71df992e68d9781d22a45b60680741d7154d7957940a4c72f5bea0e65261d479bcdd1

data/CHANGELOG.md

@@ -1,10 +1,16 @@
+# 0.0.6
+
+- Refactoring
+- Bugfixes
+- Tumblr page
+
 # 0.0.5
 
 - Flickr album
 
 # 0.0.4
 
-- Tumblr
+- Tumblr image
 - Imgur album
 
 # 0.0.3

data/README.md

@@ -28,17 +28,31 @@ Example:
 
 `nokaya -i http://ift.tt/1m2Nvz8 -n pasta`
 
-### Tumblr
+### Tumblr post
 
-`nokaya -t url` 
+`nokaya -tu url` 
 
-`nokaya -t url -n file_name`  
+`nokaya -tu url -n file_name`  
 
 Example:
 
-`nokaya -t http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela`  
+`nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela`  
 
-`nokaya -t http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela -n 'girl and monster'`
+`nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela -n 'girl and monster'`
+
+### Tumblr page
+
+Due to the various themes and layouts existing for Tumblr galleries, this feature may not work perfectly...
+
+Nokaya will try several techniques to extract the image links, then will fallback to scraping all available links if failing at properly detecting photos.  
+
+`nokaya -tal url`
+
+Example:
+
+`nokaya -tal http://brekninger.tumblr.com`
+
+Downloads all images in the page.  
 
 ### Imgur album
 

data/lib/nokaya/app.rb

@@ -10,94 +10,84 @@ module Nokaya
     map "-i" => :instagram
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def instagram *args
-      abort Status.no_url if args.empty?
+      check_args args
       nokaya = Getter.new options, :instagram, args
-      page = nokaya.parse_page
-      img_link = nokaya.get_basic page
-      begin
-        download_and_save img_link, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      basic nokaya
     end
 
     desc "favd", 'Get the photo from a Favd page (nokaya favd url)'
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     def favd *args
-      abort Status.no_url if args.empty?
+      check_args args
       nokaya = Getter.new options, :favd, args
       page = nokaya.parse_page
       img_link = nokaya.get_favd page
-      begin
-        download_and_save img_link, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      save_pic img_link, nokaya
     end
 
     desc "adn", "Get the photo 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
-      abort Status.no_url if args.empty?
+      check_args args
       nokaya = Getter.new options, :adn, args
-      page = nokaya.parse_page
-      img_link = nokaya.get_basic page
-      begin
-        download_and_save img_link, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      basic nokaya
     end
 
-    desc "tumblr", "Get the photo from a Tumblr photo page (nokaya -t url)"
-    map "-t" => :tumblr
+    desc "tumblr", "Get the photo 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
-      abort Status.no_url if args.empty?
+      check_args args
       nokaya = Getter.new options, :tumblr, args
+      basic nokaya
+    end
+
+    desc "tumblr_album", "Get all images from a Tumblr page (nokaya -tal url)"
+    map "-tal" => :tumblr_album
+    def tumblr_album *args
+      check_args args
+      nokaya = Getter.new options, :tumblr_album, args
       page = nokaya.parse_page
-      img_link = nokaya.get_basic page
-      begin
-        download_and_save img_link, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      img_links = nokaya.get_tumblr_album page
+      save_album img_links, nokaya
     end
 
     desc "imgur_album", "Get all images from an Imgur album (nokaya -ial url)"
     map "-ial" => :imgur_album
     def imgur_album *args
-      abort Status.no_url if args.empty?
+      check_args args
       nokaya = Getter.new options, :imgur_album, args
       page = nokaya.parse_page
       img_links = nokaya.get_imgur_album page
-      begin
-        download_album img_links, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      save_album img_links, nokaya
     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?
+      check_args args
       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
+      save_album img_links, nokaya
     end
 
     private
 
+    def basic nokaya
+      page = nokaya.parse_page
+      img_link = nokaya.get_basic page
+      save_pic img_link, nokaya
+    end
+
+    def check_args args
+      abort Status.no_url if args.empty?
+    end
+
     def download_and_save img_link, nokaya
       puts Status.downloading img_link
       path = Image.photo_name nokaya
-      Image.save_image(path, nokaya.get_image(img_link))
+      Image.save_image(path, img_link)
       puts Status.saved path
     end
 
@@ -107,10 +97,26 @@ module Nokaya
         parsed = URI.parse link
         file = "#{Dir.home}/Downloads/#{parsed.path.split("/").last}"
         puts Status.saving file
-        Image.save_image(file, nokaya.get_image(link))
+        Image.save_image(file, link)
       end
       puts Status.done
     end
 
+    def save_pic img_link, nokaya
+      begin
+        download_and_save img_link, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
+    end
+
+    def save_album img_links, nokaya
+      begin
+        download_album img_links, nokaya
+      rescue Interrupt
+        abort Status.canceled
+      end
+    end
+
   end
 end

data/lib/nokaya/getter.rb

@@ -16,13 +16,6 @@ module Nokaya
     def url
       @args.url
     end
-    def get_image img_link
-      begin
-        open(img_link).read
-      rescue
-        abort Status.no_can_do
-      end
-    end
     def get_basic page
       page.xpath("//meta[@property='og:image']/@content").first
     end
@@ -35,6 +28,22 @@ module Nokaya
       refs.each {|l| links << "http:#{l['href']}"}
       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.each do |query|
+        @refs = page.css query
+        next if @refs.empty?
+        break
+      end
+      links = []
+      @refs.each do |l|
+        target = l['src']
+        unless (target == 'reblog.png' || target =~ /statcounter/ || target =~ /impixu/ || target =~ /quantserve/ || target == 'like.png')
+          links << target
+        end
+      end
+      links
+    end
     def get_flickr_album page
       refs = page.css('.pc_img')
       links = []
@@ -42,11 +51,7 @@ module Nokaya
       links
     end
     def parse_page
-      Nokogiri::HTML get_page_content
-    end
-    private
-    def get_page_content
-      open @args.url
+      Nokogiri::HTML(open @args.url)
     end
   end
 end

data/lib/nokaya/image.rb

@@ -8,10 +8,18 @@ module Nokaya
         Dir.home + "/Downloads/#{nokaya.type.to_s}-#{nokaya.options[:name]}.jpg"
       end
     end
-    def self.save_image path, content
+    def self.save_image path, link
+      content = self.get_image link
       f = File.new(path, "wb")
         f.puts(content)
       f.close
     end
+    def self.get_image img_link
+      begin
+        open(img_link).read
+      rescue
+        abort Status.no_can_do
+      end
+    end
   end
 end

data/lib/nokaya/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokaya
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor