nokaya 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829ce1f0a2fb95b1457d4468404cfdd2d8182d79
-  data.tar.gz: 4557e163eaf1a75d5ca16b278d86c78a49a825a9
+  metadata.gz: d57534b0d6d2649c4953b4870d6e274e1b509429
+  data.tar.gz: b622d24ff01c28a194b7abf542e102c38bcc28e0
 SHA512:
-  metadata.gz: 66c8937d7a0068491ba9b5e9222c56ebe2129de35f90d2adddb80adbc71af428fe304e6f43f53df78971a07acb0f7bcd1d7dcb2f1aaeabb6e2b37bb4e91231fb
-  data.tar.gz: 1439a5f81f8f8de3b9c321e394a4345d233d1138a9c7803e44cf2b6e76dce307a9433989ba864c61db68b1021ef9b53eb22c40be647f5e5a49f9ba63dc944fec
+  metadata.gz: e403602b37f9e7caf9ae3143f14c43b5131b1c8503ef8649982355211b7827f9cc88ea753e43f526206fd42dd5dceff17f1c82e5716fe97141cd524b3e799ec4
+  data.tar.gz: 6e680cc80edaee91cabf1cc07ef8c431db9cb029cc093c3abfc9c7c54e9ff96ce1a97d988503983c7aed17dc7fa77471c612e37d108dfb6757ec54b30e6acf7e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.3
+
+- Global option: `--no-verbose`
+- Error handling
+- Logger
+
 # 0.1.2
 
 - New: appstore. Download icons + screenshots for an app name. Default: OSX, option for iOS.

data/README.md

@@ -2,9 +2,7 @@
 
 # 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.
+CLI to download photos from several online services including Instagram, Imgur albums, Flickr albums, App.net, Tumblr pages, Photo.net, Deviantart, movies, apps, songs, etc.  
 
 ## Installation  
 
@@ -24,27 +22,61 @@ Example:
 
 `nokaya -i http://ift.tt/1m2Nvz8`
 
-### Tumblr post    
+### Movie    
  
-`nokaya -tu url` 
+Downloads a movie poster given (part of) a movie title.
+
+`nokaya movie title`
 
 Example:
 
-`nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela`  
+`nokaya movie the dark knight`
 
-### Tumblr page    
+Use option `-a` to get an alternative.
+
+This is useful for remakes:
+
+`nokaya -m solaris`
+
+(gives the 2002 version)
+
+`nokaya -m -a solaris`
+
+(gives the 1972 version)
+
+### App store    
  
-Due to the various themes and layouts existing for Tumblr galleries, this feature may not work perfectly...
+Downloads a set of icons and screenshots for a given app name.
 
-Nokaya will try several techniques to extract the image links, then will fallback to scraping all available links if failing at properly detecting photos.  
+Defaults for Mac OSX, use option `-i` for iOS.
 
-`nokaya -tal url`
+`nokaya appstore name`
 
-Example:
+Examples:
 
-`nokaya -tal http://brekninger.tumblr.com`
+`nokaya -as marked`
 
-Downloads all images in the visible page.  
+`nokaya -as -i chimp app.net`
+
+### Music store    
+ 
+Downloads available art for an iTunes Store song.
+
+Works better if you embed separate elements between quotes.
+
+`nokaya music 'song'`
+
+`nokaya music 'song' 'artist' 'album'`
+
+Examples:
+
+`nokaya -z 'stairway to heaven'`
+
+`nokaya -z 'stairway to heaven' 'led zeppelin'`
+
+Use the `--album` option to find an album intead of a song:
+
+`nokaya -z --album 'calamari tuesday'`
 
 ### Imgur album    
  
@@ -66,6 +98,28 @@ Example:
 
 Downloads all images in the album (visible page).  
 
+### Tumblr post    
+ 
+`nokaya -tu url` 
+
+Example:
+
+`nokaya -tu http://spacequest.tumblr.com/post/83560738152/sexycomics-carlos-valenzuela`  
+
+### 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 visible page.  
+
 ### Photo.net page    
  
 `nokaya -pnet url`
@@ -94,7 +148,9 @@ Example:
 
 `nokaya -ishu https://imageshack.com/user/ToddGilbert`
 
-Downloads all images in the user gallery (visible page).  
+Downloads all images in the user gallery (visible page). 
+
+If the URL or user is invalid, will download images from the home page. 
 
 ### Favd    
  
@@ -112,73 +168,25 @@ Example:
 
 `nokaya adn https://photos.app.net/30055986/1`  
 
-### Movie    
- 
-Downloads a movie poster given (part of) a movie title.
-
-`nokaya movie title`
-
-Example:
-
-`nokaya movie the dark knight`
-
-Use option `-a` to get an alternative.
-
-This is useful for remakes:
-
-`nokaya -m solaris`
-
-(gives the 2002 version)
-
-`nokaya -m -a solaris`
-
-(gives the 1972 version)
-
-### App store    
- 
-Downloads a set of icons and screenshots for a given app name.
-
-Defaults for Mac OSX, use option `-i` for iOS.
-
-`nokaya appstore name`
-
-Examples:
-
-`nokaya -as marked`
-
-`nokaya -as -i chimp app.net`
-
-### Music store    
- 
-Downloads available art for an iTunes Store song.
-
-Works better if you embed separate elements between quotes.
-
-`nokaya music 'song'`
-
-`nokaya music 'song' 'artist' 'album'`
-
-Examples:
+## Options  
 
-`nokaya -z 'stairway to heaven'`
+### Silent
 
-`nokaya -z 'stairway to heaven' 'led zeppelin'`
+`--no-verbose`
 
-Use the `--album` option to find an album intead of a song:
+Don't display current state on the screen.
 
-`nokaya -z --album 'calamari tuesday'`
+```
+nokaya -i --no-verbose http://instagram.com/p/noANAfjJ7B/
+```  
 
-## Options  
- 
 ### Name    
  
 `--name` or `-n`
 
 Specify a name (without extension).
 
-`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n happy_dog`
-
-`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n 'happy dog'`
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n happy_dog.jpg`
 
 ### Output    
  
@@ -194,7 +202,7 @@ The picture(s) will be downloaded in '~/Downloads' if no output specified.
  
 Specify both.
 
-`nokaya -i http://instagram.com/p/noANAfjJ7B/ -o ~/Pics -n happy_dog`    
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -o ~/Pics -n happy_dog.jpg`    
 
 ## Using Nokaya in a script or irb
 
@@ -208,7 +216,7 @@ result = Nokaya::Movie.new ['terminator']
 result.save
 ```  
 
-![Nokaya object](http://dl.dropboxusercontent.com/s/4ix4j16a004iwvd/nokaya-object.png)
+![Nokaya object](http://dl.dropboxusercontent.com/s/sh8orfyuljv1jux/nokaya-object-chimp.png)
 
 
 The argument(s) for the movie/music/app/url - for the request - *have* to be in an array.

data/lib/nokaya.rb

@@ -4,5 +4,6 @@ require 'open-uri'
 require 'nokogiri'
 require 'cgi'
 require 'json'
+require 'logger'
 require_relative 'nokaya/version'
 require_relative 'nokaya/app'

data/lib/nokaya/adn.rb

@@ -8,27 +8,28 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :adn
-      parsed = self.parse(args[0])
-      @image_url = [self.get_basic(parsed)]
+      parsed = parse(args[0])
+      @urls = [get_basic(parsed)].compact
       @author = author(parsed)
-      @file_name = [name()]
+      @filenames = name_files()
     end
 
     private
 
     def author page
-      page.css('.p-nickname')[0].text
+      page.css('.p-nickname')[0].text unless page.nil?
     end
 
     def post_id args
       /\d+{2}/.match(args[0])
     end
 
-    def name
-      unless @name.nil?
-        "#{@type.to_s}-#{@name}"
+    def name_files
+      unless @urls.empty?
+        @name ||= @workers.sanitize(@author)
+        ["#{@type.to_s}-#{@name}-#{post_id(args)}.jpg"]
       else
-        "#{@type.to_s}-#{@workers.sanitize(@author)}-#{post_id(args)}.jpg"
+        []
       end
     end
 

data/lib/nokaya/app.rb

@@ -5,7 +5,9 @@ module Nokaya
 
     package_name "Nokaya"
 
-    %w{basic status movie workers instagram favd adn tumblr tumblr_album imgur_album flickr_album photonet deviantart imageshack_user apple appstore musicstore}.each {|file| require_relative "#{file}"}
+    %w{basic status movie workers instagram favd adn tumblr tumblr_album imgur_album flickr_album photonet deviantart imageshack_user apple appstore musicstore logs}.each {|file| require_relative "#{file}"}
+
+    class_option :verbose, aliases: '-V', type: :boolean, default: true, desc: 'Enable verbose mode'
 
     desc "movie TITLE", "Get the movie poster from IMDb (nokaya -m title)"
     map "-m" => :movie
@@ -13,10 +15,10 @@ module Nokaya
     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
+      puts Status.wait if options['verbose']
       image = Movie.new(args, options)
       image.save
-      puts Status.saved(image)
+      puts Status.saved(image) if options['verbose']
     end
 
     desc "appstore NAME", "Get a set of icons and screenshots for Apple apps (nokaya -as name)"
@@ -24,21 +26,21 @@ module Nokaya
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     option :ios, aliases: "-i", type: :boolean, desc: "Search iOS apps instead of Mac OSX apps"
     def appstore *args
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = AppStore.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
-    desc "music NAME", "Get available art for an iTunes Store song (nokaya -z name)"
+    desc "music TITLE", "Get available art for an iTunes Store song (nokaya -z title)"
     map "-z" => :music
     option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     option :album, type: :boolean, desc: "Find an album instead of a track"
     def music *args
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = MusicStore.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     desc "instagram URL", "Get the original picture from an Instagram page (nokaya -i url)"
@@ -46,30 +48,30 @@ module Nokaya
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = Instagram.new(args, options)
       image.save
-      puts Status.saved(image)
+      puts Status.saved(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = Favd.new(args, options)
       image.save
-      puts Status.saved(image)
+      puts Status.saved(image) if options['verbose']
     end
 
-    desc "adn URL", "Get the picture from a photos.app.net page (nokaya adn url)"
+    desc "adn URL", "Get the picture from an 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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = ADN.new(args, options)
       image.save
-      puts Status.saved(image)
+      puts Status.saved(image) if options['verbose']
     end
 
     desc "tumblr URL", "Get the picture from a Tumblr post (nokaya -tu url)"
@@ -77,70 +79,70 @@ module Nokaya
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = Tumblr.new(args, options)
       image.save
-      puts Status.saved(image)
+      puts Status.saved(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = TumblrAlbum.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = ImgurAlbum.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = FlickrAlbum.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = Photonet.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = Deviantart.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     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
-      puts Status.wait
+      puts Status.wait if options['verbose']
       image = ImageshackUser.new(args, options)
       image.save
-      puts Status.saved_album(image)
+      puts Status.saved_album(image) if options['verbose']
     end
 
     desc "version", "Displays version number and informations"

data/lib/nokaya/appstore.rb

@@ -11,29 +11,34 @@ module Nokaya
       super(args, options)
       @type = :appstore
       @appname = @workers.sanitize(args.join('_'))
-      @image_url = [grab_small(args), grab_big(args)].compact
+      @urls = [grab_small(args), grab_big(args)].compact
       find_screenshots(args)
       @path = "#{@path}/appstore-#{@appname}-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
       remove_instance_variable(:@res)
     end
 
     private
 
-    def name
-      @image_url.map.with_index do |url, index|
+    def name_files
+      @urls.map.with_index do |url, index|
         "#{@type.to_s}-#{@appname}-#{'%02d' % index}-#{File.basename(url).gsub('ApplicationIcon.', '')}"
       end
     end
 
     def find_icon terms
-      itunes_url = self.create_url(terms)
-      @res = open(itunes_url).read
+      itunes_url = create_url(terms)
+      begin
+        @res = open(itunes_url).read
+      rescue SocketError
+        Logs.rec.error 'No connexion'
+        @res = {}.to_json
+      end
       match = @res.match(/"#{@icon_size}":"(.*?)",/)
       unless match.nil?
         return match[1]
       else
-        return false
+        return nil
       end
     end
 
@@ -49,7 +54,9 @@ module Nokaya
 
     def find_screenshots terms
       res = JSON.parse(@res)
-      res['results'][0]['screenshotUrls'].each {|link| @image_url << link}
+      unless res.empty? || res['results'].empty?
+        res['results'][0]['screenshotUrls'].each {|link| @urls << link}
+      end
     end
 
   end

data/lib/nokaya/basic.rb

@@ -3,15 +3,16 @@ module Nokaya
 
   class Basic
 
-    attr_reader :options, :args, :file_name, :type, :name, :path
-    attr_accessor :image_url
+    attr_reader :options, :args, :filenames, :type, :name, :path
+    attr_accessor :urls
 
     def initialize args, options
+      Logs.create_logger
       @options = options
       @workers = Workers.new(options)
-      @args = @workers.check_args(args)
-      @file_name = []
-      @image_url = []
+      @args = args
+      @filenames = []
+      @urls = []
       @path = @workers.path
       @type = :basic
       @name = options['name'] if options['name']
@@ -19,16 +20,36 @@ module Nokaya
     end
 
     def get_basic page
-      page.xpath("//meta[@property='og:image']/@content").first.value
+      page.xpath("//meta[@property='og:image']/@content").first.value unless page.nil?
     end
 
     def parse url
-      Nokogiri::HTML(open url)
+      begin
+        Nokogiri::HTML(open url)
+      rescue Errno::ENOENT => e
+        Logs.rec.error e
+        puts Status.no_url if options['verbose']
+        return nil
+      rescue OpenURI::HTTPError => e
+        Logs.rec.error e
+        puts Status.no_can_do if options['verbose']
+        return nil
+      rescue Exception => e
+        Logs.rec.error e
+        puts Status.error if options['verbose']
+        return nil
+      end
     end
 
     def save
       @workers.save(self)
     end
 
+    def name_files
+      @urls.map do |url|
+        "#{@type.to_s}-#{@author}-#{File.basename(url)}"
+      end
+    end
+
   end
 end

data/lib/nokaya/deviantart.rb

@@ -6,11 +6,11 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :deviantart
-      parsed = self.parse(args[0])
-      @image_url = album(parsed).compact
+      parsed = parse(args[0])
+      @urls = album(parsed).compact
       @author = author()
       @path = "#{@path}/deviantart-#{@author}-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
     end
 
     private
@@ -20,15 +20,10 @@ module Nokaya
     end
 
     def album page
+      return [] if page.nil?
       refs = page.css('a.thumb')
       refs.map {|li| li['data-super-img']}
     end
 
-    def name
-      @image_url.map do |url|
-        "#{@type.to_s}-#{File.basename(url)}"
-      end
-    end
-
   end
 end

data/lib/nokaya/favd.rb

@@ -8,27 +8,30 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :favd
-      parsed = self.parse(args[0])
-      @image_url = [get_favd(parsed)]
+      parsed = parse(args[0])
+      @urls = get_favd(parsed).compact
       @author = author(parsed)
-      @file_name = [name()]
+      @filenames = name_files()
     end
 
     private
 
     def author page
-      page.css('.username')[0].text
+      username = page.css('.username')
+      username.empty? ? [] : username[0].text
     end
 
     def get_favd page
-      page.css('#largeImage')[0]['src']
+      img = page.css('#largeImage')
+      img.empty? ? [] : [img[0]['src']]
     end
 
-    def name
-      unless @name.nil?
-        "#{@type.to_s}-#{@name}"
+    def name_files
+      unless @urls.empty?
+        @name ||= @workers.sanitize(@author)
+        ["#{@type.to_s}-#{@name}-#{@workers.timed}.jpg"]
       else
-        "#{@type.to_s}-#{@workers.sanitize(@author)}-#{@workers.timed}.jpg"
+        []
       end
     end
 

data/lib/nokaya/flickr_album.rb

@@ -8,30 +8,25 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :flickr
-      parsed = self.parse(args[0])
+      parsed = parse(args[0])
       @author = author()
-      @image_url = album(parsed)
+      @urls = album(parsed).compact
       @path = "#{@path}/flickr-#{@author}-#{title(parsed)}-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
     end
 
     private
 
     def title page
-      @workers.sanitize(page.css('.set-title')[0].text)
+      @workers.sanitize(page.css('.set-title')[0].text) unless page.nil?
     end
 
     def album page
+      return [] if page.nil?
       refs = page.css('.pc_img')
       refs.map {|l| l['data-defer-src']}
     end
 
-    def name
-      @image_url.map do |url|
-        "#{@type.to_s}-#{@author}-#{File.basename(url)}"
-      end
-    end
-
     def author
       /photos\/\w+/.match(@args[0]).to_s.split('/')[1]
     end

data/lib/nokaya/imageshack_user.rb

@@ -6,11 +6,11 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :imageshack
-      parsed = self.parse(args[0])
-      @image_url = album(parsed)
+      parsed = parse(args[0])
+      @urls = album(parsed).compact
       @author = author()
       @path = "#{@path}/imageshack-#{@author}-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
     end
 
     private
@@ -20,21 +20,16 @@ module Nokaya
     end
 
     def album page
+      return [] if page.nil?
       refs = page.css('a.hero-wrapper')
       temp = refs.map {|li| "https://imageshack.com#{li['href']}"}
-      puts Status.toresolve(temp.length)
+      puts Status.toresolve(temp.length) if options['verbose']
       temp.map do |p|
-        puts Status.resolving(p)
-        ref = self.parse(p).css('figure.image img')
+        puts Status.resolving(p) if options['verbose']
+        ref = parse(p).css('figure.image img')
         "http:#{ref[0]['src']}"
       end
     end
 
-    def name
-      @image_url.map do |url|
-        "#{@type.to_s}-#{@author}-#{File.basename(url)}"
-      end
-    end
-
   end
 end

data/lib/nokaya/imgur_album.rb

@@ -8,27 +8,23 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :imgur
-      parsed = self.parse(args[0])
+      parsed = parse(args[0])
       @author = author(parsed)
-      @image_url = album(parsed)
+      @urls = album(parsed)
       @path = "#{@path}/imgur-#{@author}-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
     end
 
     private
 
     def album page
+      return [] if page.nil?
       refs = page.css('#imagelist .posts .post a')
       refs.map {|l| "http:#{l['href']}"}
     end
 
-    def name
-      @image_url.map do |url|
-        "#{@type.to_s}-#{@author}-#{File.basename(url)}"
-      end
-    end
-
     def author page
+      return [] if page.nil?
       res = page.css('.description')[0].children[1].children.text
       @workers.sanitize(res)
     end

data/lib/nokaya/instagram.rb

@@ -8,23 +8,25 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :instagram
-      parsed = self.parse(args[0])
-      @image_url = [self.get_basic(parsed)]
+      parsed = parse(args[0])
+      @urls = [get_basic(parsed)].compact
       @author = author(parsed)
-      @file_name = [name()]
+      @filenames = name_files()
     end
 
     private
 
     def author page
+      return [] if page.nil?
       page.xpath("//meta[@property='instapp:owner_user_id']/@content")[0].value
     end
 
-    def name
-      unless @name.nil?
-        "#{@type.to_s}-#{@name}"
+    def name_files
+      unless @urls.empty?
+        @name ||= @workers.sanitize(@author)
+        ["#{@type.to_s}-#{@workers.sanitize(@author)}-#{@workers.timed}.jpg"]
       else
-        "#{@type.to_s}-#{@workers.sanitize(@author)}-#{@workers.timed}.jpg"
+        []
       end
     end
 

data/lib/nokaya/logs.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Nokaya
+
+  class Logs
+
+    class << self
+      attr_accessor :rec
+    end
+
+    def self.create_logger
+      home = "#{Dir.home}/.nokaya"
+      Dir.mkdir(home) unless Dir.exist?(home)
+      @rec = Logger.new(home + "/log", 'monthly')
+      @rec.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime} (#{VERSION}) #{severity} * #{msg}\n"
+      end
+    end
+
+  end
+end

data/lib/nokaya/movie.rb

@@ -10,23 +10,25 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :movie
-      resp = Spotlite::Movie.find(@args.join(' '))
+      begin
+        resp = Spotlite::Movie.find(@args.join(' '))
+      rescue SocketError
+        Logs.rec.error 'No connexion'
+        return nil
+      end
       @options['alt'] ? res = resp[1] : res = resp[0]
       @title = res.title
       @ref_url = res.url
       @year = res.year
-      @image_url = [res.poster_url]
-      @file_name = [name()]
+      @urls = [res.poster_url]
+      @filenames = [name_files()]
     end
 
     private
 
-    def name
-      unless @name.nil?
-        "#{@type.to_s}-#{@name}"
-      else
-        "#{@type.to_s}-#{@workers.sanitize(@title)}.jpg"
-      end
+    def name_files
+      @name ||= @workers.sanitize(@title)
+      "#{@type.to_s}-#{@name}"
     end
 
   end

data/lib/nokaya/musicstore.rb

@@ -20,14 +20,19 @@ module Nokaya
       data['results'].each do |obj|
         next if obj['collectionName'].nil?
         link = obj['artworkUrl100'].gsub('100x100', '1200x1200')
-        next if @image_url.include?(link)
-        @image_url << link
-        @file_name << "#{@workers.sanitize(obj['collectionName'])}.jpg"
+        next if @urls.include?(link)
+        @urls << link
+        @filenames << "#{@workers.sanitize(obj['collectionName'])}.jpg"
       end
     end
 
     def get url
-      JSON.parse(open(url).read)
+      begin
+        JSON.parse(open(url).read)
+      rescue SocketError
+        Logs.rec.error 'No connexion'
+        return {'results' => []}
+      end
     end
 
   end

data/lib/nokaya/photonet.rb

@@ -6,23 +6,24 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :photonet
-      parsed = self.parse(args[0])
-      @image_url = album(parsed)
+      parsed = parse(args[0])
+      @urls = album(parsed)
       @path = "#{@path}/photonet-#{@workers.timed}"
-      @file_name = name()
+      @filenames = name_files()
     end
 
     private
 
     def album page
+      return [] if page.nil?
       refs = page.css('.trp-top a')
       refs.map do |lin|
         "http://gallery.photo.net/photo/#{lin['href'].split("=").last}-lg.jpg"
       end
     end
 
-    def name
-      @image_url.map do |url|
+    def name_files
+      @urls.map do |url|
         "#{@type.to_s}-#{File.basename(url).gsub('-lg', '')}"
       end
     end

data/lib/nokaya/tumblr.rb

@@ -5,23 +5,20 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :tumblr
-      parsed = self.parse(args[0])
-      @image_url = [self.get_basic(parsed)]
-      @file_name = [name()]
+      parsed = parse(args[0])
+      @urls = [get_basic(parsed)] unless parsed.nil?
+      @filenames = [name_files()]
     end
 
     private
 
-    def name
-      unless @name.nil?
-        "#{@type.to_s}-#{@name}"
-      else
-        "#{@type.to_s}-#{base()}"
-      end
+    def name_files
+      @name ||= base()
+      "#{@type.to_s}-#{@name}"
     end
 
     def base
-      File.basename(@image_url[0]).gsub('tumblr_', '')
+      File.basename(@urls[0]).gsub('tumblr_', '') unless @urls.empty?
     end
 
   end

data/lib/nokaya/tumblr_album.rb

@@ -6,15 +6,16 @@ module Nokaya
     def initialize args, options = {}
       super(args, options)
       @type = :tumblr
-      parsed = self.parse(args[0])
-      @image_url = album(parsed)
-      @file_name = name()
+      parsed = parse(args[0])
+      @urls = album(parsed)
+      @filenames = name_files()
       @path = "#{@path}/tumblr-#{@workers.timed}"
     end
 
     private
 
     def album page
+      return [] if page.nil?
       refs = []
       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|
@@ -29,11 +30,11 @@ module Nokaya
           links << target
         end
       end
-      links
+      links.compact
     end
 
-    def name
-      @image_url.map do |url|
+    def name_files
+      @urls.map do |url|
         "#{@type.to_s}-#{File.basename(url).gsub('tumblr_', '')}"
       end
     end

data/lib/nokaya/version.rb

@@ -1,3 +1,3 @@
 module Nokaya
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/nokaya/workers.rb

@@ -9,7 +9,7 @@ module Nokaya
     end
 
     def save object
-      if object.image_url.empty?
+      if object.urls.empty?
         abort(Status.no_can_do)
       else
         save_images(object)
@@ -17,24 +17,12 @@ module Nokaya
     end
 
     def save_images object
-      # if object.file_name.empty?
-        # save_files(object)
-      # else
-        save_tuples(object)
-      # end
+      save_tuples(object)
     end
 
-    # def save_files object
-    #   object.image_url.each do |url|
-    #     f = File.new("#{object.path}/#{file_name(object)}", "wb")
-    #      f.puts(get_image(url))
-    #     f.close
-    #   end
-    # end
-
     def save_tuples object
       begin
-        tuples = object.image_url.zip(object.file_name)
+        tuples = object.urls.zip(object.filenames)
         Dir.mkdir(object.path) unless Dir.exist?(object.path)
         tuples.each do |url, name|
           f = File.new("#{object.path}/#{name}", "wb")
@@ -66,12 +54,7 @@ module Nokaya
 
     def sanitize str
       reg = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
-      str.downcase.strip.gsub(reg, '_').split(' ').join('_').squeeze('_')
-    end
-
-    def check_args args
-      abort Status.no_url if args.empty?
-      return args
+      str.downcase.strip.gsub(reg, '_').split(' ').join('_').squeeze('_') unless str.nil? || str.empty?
     end
 
     def timed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokaya
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Eric Dejonckheere
@@ -151,6 +151,7 @@ files:
 - lib/nokaya/imageshack_user.rb
 - lib/nokaya/imgur_album.rb
 - lib/nokaya/instagram.rb
+- lib/nokaya/logs.rb
 - lib/nokaya/movie.rb
 - lib/nokaya/musicstore.rb
 - lib/nokaya/photonet.rb