nokaya 0.0.8 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f31b2704253ab50e0843244c13b03c6c0610a20
-  data.tar.gz: 5813f6bf4336a993604b8bcdb3e3ae7d1b0ed173
+  metadata.gz: 9d3963d242f5b924de763a5549f26a2c23ff480e
+  data.tar.gz: 01129dc6b118913ba2452adba063a25247133481
 SHA512:
-  metadata.gz: 993d92e4409efc6f832109092737213023ae367a4fc5c969de362c8db2101bf70a3828ea29119149118f9623e1479eb0cf59abfb95106271ede1805e64f5e0af
-  data.tar.gz: 7d64dac6459b889d3e2dbeeda91f9466dd00b3ccc2a6a4e9768490bb14e16cba5c506ce0c01ffdc0b26cfb9a0cac7d29bd86df34f4bd9c5fb286aaa451a0a1ca
+  metadata.gz: 6019e2867b567f8586d22b09ca1a3a887d1cc46a4d211676f84a6ac3c0e4a98dc2e47ef543e41d46d90f71a23be246512b01d8f718ba212f681d7ba2752c4eaa
+  data.tar.gz: 354ebc4eb8dee9d2c28bfd286fc89a4d9e29cc441dd8161f9c8f658ec57e73444ae879e2fe17cb6cff2036101419e2d7aeeaad2da499bf776abdde72cb39ef45

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.0
+
+- Major internal refactoring
+- New: download movie poster from movie title
+
 # 0.0.8
 
 - Option: specify an output path

data/README.md

@@ -1,47 +1,39 @@
+[![Gem Version](https://badge.fury.io/rb/nokaya.svg)](http://badge.fury.io/rb/nokaya)
+
 # Nokaya
 
 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.
 
-## Installation
+## Installation  
 
 `gem install nokaya`
 
-## Usage
-
-### Instagram
-
+## Usage  
+ 
+### Instagram    
+ 
 `nokaya -i url`  
 
-`nokaya -i url -n file_name`  
-
-`nokaya -i url -n 'file name'`  
-
 Also accepts the IFTTT format (like 'http://ift.tt/1m2Nvz8').  
 
 Example:
 
 `nokaya -i http://instagram.com/p/noANAfjJ7B/`  
 
-`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n happydog`
-
-`nokaya -i http://ift.tt/1m2Nvz8 -n pasta`
-
-### Tumblr post
+`nokaya -i http://ift.tt/1m2Nvz8`
 
+### Tumblr post    
+ 
 `nokaya -tu url` 
 
-`nokaya -tu url -n file_name`  
-
 Example:
 
 `nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela`  
 
-`nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela -n 'girl and monster'`
-
-### Tumblr page
-
+### 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.  
@@ -52,30 +44,30 @@ Example:
 
 `nokaya -tal http://brekninger.tumblr.com`
 
-Downloads all images in the page.  
-
-### Imgur album
+Downloads all images in the visible page.  
 
+### Imgur album    
+ 
 `nokaya -ial url`
 
 Example:
 
 `nokaya -ial http://imgur.com/a/JNzjB\#0`
 
-Downloads all images in the album.  
-
-### Flickr album
+Downloads all images in the album (visible page).  
 
+### Flickr album    
+ 
 `nokaya -fal url`
 
 Example:
 
 `nokaya -fal https://www.flickr.com/photos/ericdke/sets/72157644556227302/`
 
-Downloads all images in the album.  
-
-### Photo.net page
+Downloads all images in the album (visible page).  
 
+### Photo.net page    
+ 
 `nokaya -pnet url`
 
 Example:
@@ -84,62 +76,78 @@ Example:
 
 Downloads all images in the page.  
 
-### Deviantart gallery
-
+### Deviantart gallery    
+ 
 `nokaya -dart url`
 
 Example:
 
 `nokaya -dart http://www.deviantart.com/photography/nature/waterscapes/`
 
-Downloads all images in the gallery. 
-
-### Imageshack user gallery
+Downloads all images in the gallery (visible page). 
 
+### Imageshack user gallery    
+ 
 `nokaya -ishu url`
 
 Example:
 
 `nokaya -ishu https://imageshack.com/user/ToddGilbert`
 
-Downloads all images in the user gallery.  
-
-### Favd
+Downloads all images in the user gallery (visible page).  
 
+### Favd    
+ 
 `nokaya favd url` 
 
-`nokaya favd url -n file_name`  
-
 Example:
 
 `nokaya favd http://pic.favd.net/29987710`  
 
-`nokaya favd http://pic.favd.net/29987710 -n feet`
+### App.net    
+ 
+`nokaya adn url` 
 
-### App.net
+Example:
 
-`nokaya adn url` 
+`nokaya adn https://photos.app.net/30055986/1`  
+
+### Movie    
+ 
+Downloads a movie poster given (part of) a movie title.
 
-`nokaya adn url -n file_name`  
+`nokaya movie title`
 
 Example:
 
-`nokaya adn https://photos.app.net/30055986/1`  
+`nokaya movie the dark knight`
+
+Use option `-a` to get an alternative.
 
-`nokaya adn https://photos.app.net/30055986/1 -n random`
+This is useful for remakes:
 
-## Options
+`nokaya movie solaris`
 
-### Name
+(gives the 2002 version)
 
+`nokaya movie -a solaris`
+
+(gives the 1972 version)
+
+## Options  
+ 
+### Name    
+ 
 `--name` or `-n`
 
 Specify a name (without extension).
 
 `nokaya -i http://instagram.com/p/noANAfjJ7B/ -n happy_dog`
 
-### Output
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n 'happy dog'`
 
+### Output    
+ 
 `--output` or `-o`
 
 Specify an output path.
@@ -148,8 +156,8 @@ Specify an output path.
 
 The picture(s) will be downloaded in '~/Downloads' if no output specified.
 
-### Both
-
+### Both    
+ 
 Specify both.
 
 `nokaya -i http://instagram.com/p/noANAfjJ7B/ -o ~/Pics -n happy_dog`    

data/lib/nokaya.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
-require 'ostruct'
 require 'thor'
-require 'terminal-table/import'
 require 'open-uri'
 require 'nokogiri'
 require_relative 'nokaya/version'

data/lib/nokaya/adn.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+module Nokaya
+  class ADN < Basic
+
+    attr_reader :author
+
+    def initialize args, options
+      super(args, options)
+      @type = :adn
+      parsed = self.parse(args[0])
+      @image_url = [self.get_basic(parsed)]
+      @author = author(parsed)
+      @file_name = [name()]
+    end
+
+    private
+
+    def author page
+      page.css('.p-nickname')[0].text
+    end
+
+    def post_id args
+      /\d+{2}/.match(args[0])
+    end
+
+    def name
+      unless @name.nil?
+        "#{@type.to_s}-#{@name}"
+      else
+        "#{@type.to_s}-#{@workers.sanitize(@author)}-#{post_id(args)}.jpg"
+      end
+    end
+
+  end
+end

data/lib/nokaya/app.rb

@@ -1,168 +1,132 @@
 # encoding: utf-8
 module Nokaya
   class App < Thor
+
     package_name "Nokaya"
-    require_relative 'getter'
-    require_relative 'image'
-    require_relative 'status'
 
-    desc "instagram", "Get the original picture from an Instagram page (nokaya -i url)"
+    %w{basic status movie workers instagram favd adn tumblr tumblr_album imgur_album flickr_album photonet deviantart imageshack_user}.each {|file| require_relative "#{file}"}
+
+    desc "movie TITLE", "Get the movie poster from IMDb (nokaya -m url)"
+    map "-m" => :movie
+    option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
+    option :alt, aliases: "-a", type: :boolean, desc: "Find an alternative response"
+    def movie *args
+      puts Status.wait
+      image = Movie.new(args, options)
+      image.save
+      puts Status.saved(image)
+    end
+
+    desc "instagram URL", "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"
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def instagram *args
-      check_args args
-      nokaya = Getter.new options, :instagram, args
-      basic nokaya
+      puts Status.wait
+      image = Instagram.new(args, options)
+      image.save
+      puts Status.saved(image)
     end
 
-    desc "favd", 'Get the picture from a Favd page (nokaya favd url)'
+    desc "favd URL", 'Get the picture from a Favd page (nokaya favd url)'
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def favd *args
-      check_args args
-      nokaya = Getter.new options, :favd, args
-      page = nokaya.parse_page
-      img_link = nokaya.get_favd page
-      save_pic img_link, nokaya
+      puts Status.wait
+      image = Favd.new(args, options)
+      image.save
+      puts Status.saved(image)
     end
 
-    desc "adn", "Get the picture from a photos.app.net page (nokaya adn url)"
+    desc "adn URL", "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"
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def adn *args
-      check_args args
-      nokaya = Getter.new options, :adn, args
-      basic nokaya
+      puts Status.wait
+      image = ADN.new(args, options)
+      image.save
+      puts Status.saved(image)
     end
 
-    desc "tumblr", "Get the picture from a Tumblr post (nokaya -tu url)"
+    desc "tumblr URL", "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"
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def tumblr *args
-      check_args args
-      nokaya = Getter.new options, :tumblr, args
-      basic nokaya
+      puts Status.wait
+      image = Tumblr.new(args, options)
+      image.save
+      puts Status.saved(image)
     end
 
-    desc "tumblr_album", "Get all pictures from a Tumblr page (nokaya -tal url)"
+    desc "tumblr_album URL", "Get all pictures from a Tumblr page (nokaya -tal url)"
     map "-tal" => :tumblr_album
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def tumblr_album *args
-      check_args args
-      nokaya = Getter.new options, :tumblr_album, args
-      page = nokaya.parse_page
-      img_links = nokaya.get_tumblr_album page
-      save_album img_links, nokaya
+      puts Status.wait
+      image = TumblrAlbum.new(args, options)
+      image.save
+      puts Status.saved_album(image)
     end
 
-    desc "imgur_album", "Get all pictures from an Imgur album (nokaya -ial url)"
+    desc "imgur_album URL", "Get all pictures from an Imgur album (nokaya -ial url)"
     map "-ial" => :imgur_album
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def imgur_album *args
-      check_args args
-      nokaya = Getter.new options, :imgur_album, args
-      page = nokaya.parse_page
-      img_links = nokaya.get_imgur_album page
-      save_album img_links, nokaya
+      puts Status.wait
+      image = ImgurAlbum.new(args, options)
+      image.save
+      puts Status.saved_album(image)
     end
 
-    desc "flickr_album", "Get all pictures from a Flickr album (nokaya -fal url)"
+    desc "flickr_album URL", "Get all pictures from a Flickr album (nokaya -fal url)"
     map "-fal" => :flickr_album
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def flickr_album *args
-      check_args args
-      nokaya = Getter.new options, :flickr_album, args
-      page = nokaya.parse_page
-      img_links = nokaya.get_flickr_album page
-      save_album img_links, nokaya
+      puts Status.wait
+      image = FlickrAlbum.new(args, options)
+      image.save
+      puts Status.saved_album(image)
     end
 
-    desc "photonet", "Get all pictures from a Photo.net page (nokaya -pnet url)"
+    desc "photonet URL", "Get all pictures from a Photo.net page (nokaya -pnet url)"
     map "-pnet" => :photonet
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     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
+      puts Status.wait
+      image = Photonet.new(args, options)
+      image.save
+      puts Status.saved_album(image)
     end
 
-    desc "deviantart", "Get all pictures from a Deviantart gallery (nokaya -dart url)"
+    desc "deviantart URL", "Get all pictures from a Deviantart gallery (nokaya -dart url)"
     map "-dart" => :deviantart
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     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
+      puts Status.wait
+      image = Deviantart.new(args, options)
+      image.save
+      puts Status.saved_album(image)
     end
 
-    desc "imageshack_user", "Get all pictures from an Imageshack user gallery (nokaya -ishu url)"
+    desc "imageshack_user URL", "Get all pictures from an Imageshack user gallery (nokaya -ishu url)"
     map "-ishu" => :imageshack_user
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     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
-      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, img_link)
-      puts Status.saved path
-    end
-
-    def download_album img_links, 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}/#{parsed.path.split("/").last}"
-        puts Status.saving file
-        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
-        abort Status.no_can_do if img_links.empty?
-        download_album img_links, nokaya
-      rescue Interrupt
-        abort Status.canceled
-      end
+      puts Status.wait
+      image = ImageshackUser.new(args, options)
+      image.save
+      puts Status.saved_album(image)
+    end
+
+    desc "version", "Displays version number and informations"
+    map "-v" => :version
+    def version
+      puts "\nNOKAYA\n\n"
+      puts "Version:\t#{VERSION}\n\n"
+      puts "Changelog:\thttps://github.com/ericdke/nokaya/blob/master/CHANGELOG.md\n"
+      puts "Help:\t\thttps://github.com/ericdke/nokaya/blob/master/README.md\n\n"
     end
 
   end