ayadn 1.4.2 → 1.4.3

data/lib/ayadn/alias.rb

@@ -21,7 +21,7 @@ module Ayadn
           puts Status.error_missing_channel_id
         end
       rescue => e
-        Errors.global_error("alias/create", args, e)
+        Errors.global_error({error: e, caller: caller, data: [args]})
       ensure
         Databases.close_all
       end
@@ -41,7 +41,7 @@ module Ayadn
           Action.quit Status.wrong_arguments
         end
       rescue => e
-        Errors.global_error("alias/delete", args, e)
+        Errors.global_error({error: e, caller: caller, data: [args]})
       ensure
         Databases.close_all
       end
@@ -65,7 +65,7 @@ module Ayadn
           puts "\nFile '#{new_db}' doesn't exist.".color(:red)
         end
       rescue => e
-        Errors.global_error("alias/import", database, e)
+        Errors.global_error({error: e, caller: caller, data: [database]})
       ensure
         Databases.close_all
       end
@@ -90,7 +90,7 @@ module Ayadn
           puts Status.empty_list
         end
       rescue => e
-        Errors.global_error("alias/list", args, e)
+        Errors.global_error({error: e, caller: caller, data: [options]})
       ensure
         Databases.close_all
       end
@@ -110,7 +110,7 @@ module Ayadn
           abort Status.canceled
         end
       rescue => e
-        Errors.global_error("alias/clear", args, e)
+        Errors.global_error({error: e, caller: caller, data: []})
       ensure
         Databases.close_all
       end

data/lib/ayadn/api.rb

@@ -65,7 +65,7 @@ module Ayadn
       get_parsed_response(Endpoints.new.whostarred(post_id))
     end
 
-    def get_convo(post_id, options)
+    def get_convo(post_id, options = {})
       get_parsed_response(Endpoints.new.convo(post_id, options))
     end
 
@@ -230,7 +230,7 @@ module Ayadn
       if res['meta']['code'] == 200
         res
       else
-        Errors.global_error("api/check_response_meta_code", nil, res['meta'])
+        Errors.global_error({error: nil, caller: caller, data: [res['meta']]})
       end
     end
 
@@ -300,6 +300,7 @@ module Ayadn
       big_hash = {}
       loop do
         resp = get_parsed_response(get_list_url(username, target, options))
+        abort(Status.user_404(username)) if resp['meta']['code'] == 404
         big_hash.merge!(Workers.extract_users(resp))
         break if resp['meta']['min_id'] == nil
         options = {:count => 200, :before_id => resp['meta']['min_id']}

data/lib/ayadn/app.rb

@@ -419,7 +419,8 @@ module Ayadn
     desc "nowplaying", "Post the current iTunes track (-np)"
     map "-np" => :nowplaying
     long_desc Descriptions.nowplaying
-    option :no_url, type: :boolean, desc: "Don't append preview or album art at the end of the post"
+    option :no_url, aliases: "-n", type: :boolean, desc: "Don't append preview or album art at the end of the post"
+    option :lastfm, aliases: "-l", type: :boolean, desc: "Get current track from Last.fm instead of iTunes"
     def nowplaying
       Action.new.nowplaying(options)
     end

data/lib/ayadn/cnx.rb

@@ -3,10 +3,20 @@ module Ayadn
   class CNX
 
     def self.download url
+      working = true
       begin
         RestClient.get(url) {|response, request, result| response}
+      rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError, RestClient::RequestTimeout => e
+        if working == true
+          working = false
+          puts "\nOoops, '#{url}' didn't respond. Trying again in 5 secs.\n".color(:red)
+          sleep 5
+          retry
+        end
+        puts "\nConnexion error.\n\n".color(:red)
+        Errors.global_error({error: e, caller: caller, data: [url, response]})
       rescue => e
-        Errors.global_error("cnx.rb/download", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url, response]})
       end
     end
 
@@ -26,7 +36,7 @@ module Ayadn
         Errors.nr "URL: #{url}"
         return {'meta' => {'code' => 666}, 'data' => "#{e}"}.to_json
       rescue => e
-        Errors.global_error("cnx.rb/get", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url, response]})
       end
     end
 
@@ -36,7 +46,7 @@ module Ayadn
         response
       when 204
         puts "\nError: the NiceRank filter made too many requests to the server. You may either wait for a little while before scrolling the filtered Global again, or set the scroll timer to a greater value (example: `ayadn set scroll timer 5`). (see http://ayadn-app.net/doc).\n".color(:red)
-        Errors.global_error("cnx.rb/get", [url, response.inspect, response.headers], "NiceRank: TOO MANY REQUESTS")
+        Errors.global_error({error: "NiceRank: TOO MANY REQUESTS", caller: caller, data: [url, response.inspect, response.headers]})
       else
         response
       end
@@ -55,9 +65,9 @@ module Ayadn
           retry
         end
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get_response_from", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url]})
       rescue => e
-        Errors.global_error("cnx.rb/get_response_from", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url, response]})
       end
     end
 
@@ -77,29 +87,29 @@ module Ayadn
         response
       when 204
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "NO CONTENT")
+        Errors.global_error({error: "NO CONTENT", caller: caller, data: [message, response.headers]})
       when 400
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "BAD REQUEST")
+        Errors.global_error({error: "BAD REQUEST", caller: caller, data: [message, response.headers]})
       when 401
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "UNAUTHORIZED")
+        Errors.global_error({error: "UNAUTHORIZED", caller: caller, data: [message, response.headers]})
       when 403
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "FORBIDDEN")
+        Errors.global_error({error: "FORBIDDEN", caller: caller, data: [message, response.headers]})
       when 405
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "METHOD NOT ALLOWED")
+        Errors.global_error({error: "METHOD NOT ALLOWED", caller: caller, data: [message, response.headers]})
       when 429
         puts "\n#{message}".color(:red)
         puts "\n\nAyadn made too many requests to the App.net API. You should wait at least ".color(:cyan) + "#{response.headers[:retry_after]} ".color(:red) + "seconds before trying again. Maybe you launched a lot of Ayadn instances at the same time? That's no problem, but in this case you should increase the value of the scroll timer (with `ayadn set scroll timer 5` for example). App.net allows 5000 requests per hour per account maximum.".color(:cyan)
-        Errors.global_error("cnx.rb", [message, response.headers], "TOO MANY REQUESTS")
+        Errors.global_error({error: "TOO MANY REQUESTS", caller: caller, data: [message, response.headers]})
       when 500
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "APP.NET SERVER ERROR")
+        Errors.global_error({error: "APP.NET SERVER ERROR", caller: caller, data: [message, response.headers]})
       when 507
         puts "\n#{message}".color(:red)
-        Errors.global_error("cnx.rb", [message, response.headers], "INSUFFICIENT STORAGE")
+        Errors.global_error({error: "INSUFFICIENT STORAGE", caller: caller, data: [message, response.headers]})
       else
         response
       end
@@ -107,19 +117,15 @@ module Ayadn
 
     def self.delete(url)
       begin
-        #RestClient::Resource.new(url).delete
         RestClient.delete(url) do |response, request, result|
           Debug.http response, url
           check response
         end
-      rescue SocketError => e
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/delete", url, e)
-      rescue SystemCallError => e
+      rescue SocketError, SystemCallError => e
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/delete", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url]})
       rescue => e
-        Errors.global_error("cnx.rb/delete", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url]})
       end
     end
 
@@ -129,14 +135,11 @@ module Ayadn
           Debug.http response, url
           check response
         end
-      rescue SocketError => e
+      rescue SocketError, SystemCallError => e
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/post", url, e)
-      rescue SystemCallError => e
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/post", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url, payload]})
       rescue => e
-        Errors.global_error("cnx.rb/post", [url, payload], e)
+        Errors.global_error({error: e, caller: caller, data: [url, payload]})
       end
     end
 
@@ -146,14 +149,11 @@ module Ayadn
           Debug.http response, url
           check response
         end
-      rescue SocketError => e
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/put", url, e)
-      rescue SystemCallError => e
+      rescue SocketError, SystemCallError => e
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/put", url, e)
+        Errors.global_error({error: e, caller: caller, data: [url, payload]})
       rescue => e
-        Errors.global_error("cnx.rb/put", [url, payload], e)
+        Errors.global_error({error: e, caller: caller, data: [url, payload]})
       end
     end
 

data/lib/ayadn/databases.rb

@@ -24,12 +24,8 @@ module Ayadn
     def self.close_all
 
       if @nicerank.size > 10000
-        limit = Time.now - (3600 * 168)
+        limit = Time.now - (3600 * 48)
         @nicerank.each {|k,v| @nicerank.delete(k) if v[:cached] < limit}
-        if @nicerank.size > 10000
-          limit = Time.now - (3600 * 48)
-          @nicerank.each {|k,v| @nicerank.delete(k) if v[:cached] < limit}
-        end
       end
 
       Debug.db all_dbs
@@ -140,7 +136,7 @@ module Ayadn
         @index.each {|id, values| return values if values[:count] == number}
       else
         puts Status.must_be_in_index
-        Errors.global_error("databases/get_post_from_index", number, "out of range")
+        Errors.global_error({error: "Out of range", caller: caller, data: [number]})
       end
     end
 

data/lib/ayadn/debug.rb

@@ -4,11 +4,13 @@ module Ayadn
 
     def self.http response, url
       if Settings.options[:timeline][:show_debug] == true
-        deb = ":::::\n"
-        deb << "Url:\t\t#{url}\n\n"
-        deb << "Headers:\t#{response.headers}\n"
-        deb << ":::::\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = ":::::\n"
+        # deb << "Url:\t\t#{url}\n\n"
+        # deb << "Headers:\t#{response.headers}\n"
+        # deb << ":::::\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.debug "HTTP/URL: #{url}"
+        Logs.rec.debug "HTTP/HEADERS: #{response.headers}"
       end
     end
 
@@ -17,73 +19,88 @@ module Ayadn
         puts "/////\nSETTINGS\n"
         jj JSON.parse((Settings.config).to_json)
         jj JSON.parse((Settings.options).to_json)
+        Logs.rec.debug "SETTINGS/CONFIG: #{Settings.config}"
+        Logs.rec.debug "SETTINGS/OPTIONS: #{Settings.options}"
         puts "/////\n\n"
 
-        puts ">>>>>\nDATABASES\n"
+        #puts ">>>>>\nDATABASES\n"
         dbs.each do |db|
-          puts "Path:\t#{db.file}\nLength:\t#{db.size}\nSize:\t#{db.bytesize / 1024}KB"
+          #puts "Path:\t#{db.file}\nLength:\t#{db.size}\nSize:\t#{db.bytesize / 1024}KB"
+          Logs.rec.debug "DB: #{File.basename(db.file)} - Length: #{db.size}, Size: #{db.bytesize / 1024}KB"
         end
-        puts ">>>>>\n\n"
+        #puts ">>>>>\n\n"
 
-        puts "^^^^^\nTOKEN\n"
-        puts Settings.user_token
-        puts "^^^^^\n\n"
+        # puts "^^^^^\nTOKEN\n"
+        # puts Settings.user_token
+        # puts "^^^^^\n\n"
       end
     end
 
-    def self.err error
+    def self.err error, stack
       if Settings.options[:timeline][:show_debug] == true
-        puts "--*--\nTRACE:\n"
+        puts "\n--*--\nERROR:\n"
         raise error
+        puts "\n--*--\nSTACK:\n"
+        puts stack
         puts "\n--*--\n\n"
       end
     end
 
     def self.how_many_ranks niceranks, get_these
       if Settings.options[:timeline][:show_debug] == true
-        deb = "=====\n"
-        deb << "NR from DB:\t#{niceranks}\n\n"
-        deb << "NR to get:\t#{get_these}\n"
-        deb << "=====\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = "=====\n"
+        # deb << "NR from DB:\t#{niceranks}\n\n"
+        # deb << "NR to get:\t#{get_these}\n"
+        # deb << "=====\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.debug "NR/FROM DB: #{niceranks}"
+        Logs.rec.debug "NR/TO GET: #{get_these}"
       end
     end
 
     def self.ranks_pool niceranks
       if Settings.options[:timeline][:show_debug] == true
-        deb = "=====\n"
-        deb << "NR in pool:\t#{niceranks}\n"
-        deb << "=====\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = "=====\n"
+        # deb << "NR in pool:\t#{niceranks}\n"
+        # deb << "=====\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.debug "NR/IN POOL: #{niceranks}"
       end
     end
 
     def self.niceranks_error resp
       if Settings.options[:timeline][:show_debug] == true
-        deb = "=====\n"
-        deb << "NR Error:\t#{resp}\n"
-        deb << "=====\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = "=====\n"
+        # deb << "NR Error:\t#{resp}\n"
+        # deb << "=====\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.error "NR/ERROR: #{resp}"
       end
     end
 
     def self.total_ranks niceranks
       if Settings.options[:timeline][:show_debug] == true
-        deb = "=====\n"
-        deb << "NiceRanks:\t#{niceranks}\n\n"
-        deb << "DB size:\t#{Databases.nicerank.size}\n"
-        deb << "=====\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = "=====\n"
+        # deb << "NiceRanks:\t#{niceranks}\n\n"
+        # deb << "DB size:\t#{Databases.nicerank.size}\n"
+        # deb << "=====\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.debug "NR/RANKS: #{niceranks}"
+        Logs.rec.debug "NR/DB SIZE: #{Databases.nicerank.size}"
       end
     end
 
     def self.stream stream, options, target
       if Settings.options[:timeline][:show_debug] == true
-        deb = "+++++\nStream meta:\t#{stream['meta']}\n\n"
-        deb << "Options:\t#{options.inspect}\n\n"
-        deb << "Target:\t\t#{target.inspect}\n\n"
-        deb << "Posts:\t\t#{stream['data'].length}\n+++++\n"
-        puts deb.color(Settings.options[:colors][:debug])
+        # deb = "+++++\nStream meta:\t#{stream['meta']}\n\n"
+        # deb << "Options:\t#{options.inspect}\n\n"
+        # deb << "Target:\t\t#{target.inspect}\n\n"
+        # deb << "Posts:\t\t#{stream['data'].length}\n+++++\n"
+        # puts deb.color(Settings.options[:colors][:debug])
+        Logs.rec.debug "STREAM/META: #{stream['meta']}"
+        Logs.rec.debug "STREAM/OPTIONS: #{options.inspect}"
+        Logs.rec.debug "STREAM/TARGET: #{target.inspect}"
+        Logs.rec.debug "STREAM/POSTS: #{stream['data'].length}"
       end
     end
 

data/lib/ayadn/errors.rb

@@ -1,17 +1,21 @@
 # encoding: utf-8
 module Ayadn
   class Errors
-    def self.global_error(where, args, error)
-      #elems = []
-      #args.each {|arg| elems << self.detokenize(arg)} #TODO: make it work
+    def self.global_error(args)
       Logs.rec.error "--BEGIN--"
-      Logs.rec.error "#{error}"
-      Logs.rec.debug "LOCATION: #{where}"
-      Logs.rec.debug "DATA: #{args}"
-      Logs.rec.debug "STACK: #{caller}"
+      Logs.rec.error "CAUSE: #{args[:error]}"
+      Logs.rec.debug "DATA: #{args[:data]}"
+      stack = args[:caller].map do |path|
+        splitted = path.split('/')
+        file = splitted.pop
+        dir = splitted.pop
+        "#{dir}/#{file}"
+      end
+      Logs.rec.debug "STACK: #{stack}"
+      #Logs.rec.debug "STACK: #{args[:caller]}"
       Logs.rec.error "--END--"
-      puts "\n(error logged in #{Settings.config[:paths][:log]}/ayadn.log)\n".color(:blue)
-      Debug.err error
+      puts "\nError logged in #{Settings.config[:paths][:log]}/ayadn.log\n".color(:blue)
+      Debug.err(args[:error], stack)
       exit
     end
     def self.error(status)
@@ -29,11 +33,5 @@ module Ayadn
     def self.nr msg
       Logs.nr.warn msg
     end
-
-    private
-
-    def self.detokenize(string)
-      string.dup.to_s.gsub!(/token=[a-zA-Z0-9_-]+/, "token=XXX") unless string.nil?
-    end
   end
 end

data/lib/ayadn/logs.rb

@@ -9,11 +9,11 @@ module Ayadn
     def self.create_logger
       @rec = Logger.new(Settings.config[:paths][:log] + "/ayadn.log", 'monthly')
       @rec.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime} (#{Settings.config[:version]}) #{severity} -- #{msg}\n"
+        "#{datetime} (#{Settings.config[:version]}) #{severity} * #{msg}\n"
       end
       @nr = Logger.new(Settings.config[:paths][:log] + "/nicerank.log", 'monthly')
       @nr.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime} (#{Settings.config[:version]}) #{severity} -- #{msg}\n"
+        "#{datetime} (#{Settings.config[:version]}) #{severity} * #{msg}\n"
       end
     end
 

data/lib/ayadn/mark.rb

@@ -49,7 +49,7 @@ module Ayadn
         Logs.rec.info "Added conversation bookmark for post #{bookmark[:id]}."
         puts Status.done
       rescue => e
-        Errors.global_error("mark/add", args, e)
+        Errors.global_error({error: e, caller: caller, data: [args]})
       ensure
         Databases.close_all
       end
@@ -70,7 +70,7 @@ module Ayadn
         puts "\n"
         list.each {|marked| puts make_entry marked; puts "\n"}
       rescue => e
-        Errors.global_error("mark/list", nil, e)
+        Errors.global_error({error: e, caller: caller, data: [args, options]})
       ensure
         Databases.close_all
       end
@@ -90,7 +90,7 @@ module Ayadn
           abort Status.canceled
         end
       rescue => e
-        Errors.global_error("mark/clear", nil, e)
+        Errors.global_error({error: e, caller: caller, data: []})
       ensure
         Databases.close_all
       end
@@ -106,7 +106,7 @@ module Ayadn
         Databases.delete_bookmark post_id
         puts Status.done
       rescue => e
-        Errors.global_error("mark/delete", args, e)
+        Errors.global_error({error: e, caller: caller, data: [args]})
       ensure
         Databases.close_all
       end
@@ -126,7 +126,7 @@ module Ayadn
         Databases.rename_bookmark post_id, new_title
         puts Status.done
       rescue => e
-        Errors.global_error("mark/rename", args, e)
+        Errors.global_error({error: e, caller: caller, data: [args]})
       ensure
         Databases.close_all
       end

data/lib/ayadn/pinboard.rb

@@ -16,7 +16,7 @@ module Ayadn
         abort(Status.canceled)
       rescue => e
         puts Status.wtf
-        Errors.global_error("pinboard/ask_credentials", pin_username, e)
+        Errors.global_error({error: e, caller: caller, data: [pin_username]})
       end
       save_credentials(encode(pin_username, pin_password))
     end

data/lib/ayadn/post.rb

@@ -11,14 +11,7 @@ module Ayadn
     end
 
     def compose
-      # case Settings.config[:platform]
-      # when /mswin|mingw|cygwin/
-        # post = classic
-      # else
-        require "readline"
-        readline
-      # end
-      # post
+        readline()
     end
 
     def send_embedded text, files
@@ -61,7 +54,12 @@ module Ayadn
             "height" => dic['height'],
             "title" => dic['title'],
             "url" => dic['artwork'],
-            "embeddable_url" => dic['artwork']
+            "embeddable_url" => dic['artwork'],
+            "provider_url" => "https://itunes.apple.com",
+            "provider_name" => "iTunes",
+            "thumbnail_url" => dic['artwork_thumb'],
+            "thumbnail_width" => dic['width_thumb'],
+            "thumbnail_height" => dic['height_thumb']
           }
         }
       end
@@ -115,19 +113,6 @@ module Ayadn
       return base
     end
 
-    # def auto_classic
-    #   loop do
-    #     begin
-    #       print "#{Settings.config[:identity][:handle]} >> ".color(:red)
-    #       t = STDIN.gets.chomp
-    #       send_post(t)
-    #       puts Status.done
-    #     rescue Interrupt
-    #       abort(Status.canceled)
-    #     end
-    #   end
-    # end
-
     def auto_readline
       loop do
         begin
@@ -150,18 +135,11 @@ module Ayadn
           post << buffer
         end
       rescue Interrupt
-        #Errors.info "Write post: canceled."
         abort(Status.canceled)
       end
       post
     end
 
-    # def classic
-    #   puts Status.classic
-    #   input_text = STDIN.gets.chomp
-    #   [input_text]
-    # end
-
     def reply(new_post, replied_to)
       replied_to = replied_to.values[0]
       reply = replied_to[:handle].dup

data/lib/ayadn/settings.rb

@@ -82,13 +82,13 @@ module Ayadn
         begin
           @options = YAML.load(File.read(config_file))
         rescue => e
-          Errors.global_error("myconfig/load config.yml", nil, e)
+          Errors.global_error({error: e, caller: caller, data: []})
         end
       else
         begin
           self.write_config_file(config_file, @options)
         rescue => e
-          Errors.global_error("myconfig/create config.yml from defaults", nil, e)
+          Errors.global_error({error: e, caller: caller, data: []})
         end
       end
     end

data/lib/ayadn/status.rb

@@ -54,37 +54,37 @@ module Ayadn
       "\nStarring #{post_id}".inverse
     end
     def self.not_deleted(post_id)
-      "Could not delete post #{post_id} (post isn't yours, or is already deleted)\n".color(:red)
+      "\nCould not delete post #{post_id} (post isn't yours, or is already deleted)\n".color(:red)
     end
     def self.not_starred(post_id)
-      "Could not star post #{post_id} (post doesn't exist, or is already starred)\n".color(:red)
+      "\nCould not star post #{post_id} (post doesn't exist, or is already starred)\n".color(:red)
     end
     def self.not_unreposted(post_id)
-      "Could not unrepost post #{post_id} (post isn't yours, isn't a repost, or has been deleted)\n".color(:red)
+      "\nCould not unrepost post #{post_id} (post isn't yours, isn't a repost, or has been deleted)\n".color(:red)
     end
     def self.not_reposted(post_id)
-      "Could not repost post #{post_id} (post has been deleted?)\n".color(:red)
+      "\nCould not repost post #{post_id} (post has been deleted?)\n".color(:red)
     end
     def self.not_unstarred(post_id)
-      "Could not unstar post #{post_id} (post isn't yours, isn't starred, or has been deleted)\n".color(:red)
+      "\nCould not unstar post #{post_id} (post isn't yours, isn't starred, or has been deleted)\n".color(:red)
     end
     def self.not_unfollowed(post_id)
-      "Could not unfollow user #{username} (doesn't exist, or wasn't already followed)\n".color(:red)
+      "\nCould not unfollow user #{username} (doesn't exist, or wasn't already followed)\n".color(:red)
     end
     def self.not_followed(post_id)
-      "Could not follow user #{username} (doesn't exist, or you already follow)\n".color(:red)
+      "\nCould not follow user #{username} (doesn't exist, or you already follow)\n".color(:red)
     end
     def self.not_unmuted(post_id)
-      "Could not unmute user #{username} (doesn't exist, or wasn't already muted)\n".color(:red)
+      "\nCould not unmute user #{username} (doesn't exist, or wasn't already muted)\n".color(:red)
     end
     def self.not_muted(post_id)
-      "Could not mute user #{username} (doesn't exist, or is already muted)\n".color(:red)
+      "\nCould not mute user #{username} (doesn't exist, or is already muted)\n".color(:red)
     end
     def self.not_unblocked(post_id)
-      "Could not unblock user #{username} (doesn't exist, or wasn't already blocked)\n".color(:red)
+      "\nCould not unblock user #{username} (doesn't exist, or wasn't already blocked)\n".color(:red)
     end
     def self.not_blocked(post_id)
-      "Could not block user #{username} (doesn't exist, or is already blocked)\n".color(:red)
+      "\nCould not block user #{username} (doesn't exist, or is already blocked)\n".color(:red)
     end
     def self.deleted(post_id)
       "\nPost #{post_id} has been deleted.\n".color(:green)
@@ -210,7 +210,7 @@ module Ayadn
       "\nSaving post text and links to Pinboard...\n\n".color(:yellow)
     end
     def self.error_only_osx
-      "\nThis feature only works with Mac OS X and iTunes, sorry.\n\n".color(:red)
+      "\nThis feature only works with iTunes by default. If you've got a Last.fm account, add the option:\n\n`ayadn -np --lastfm` (short: `-l`).\n\n".color(:red)
     end
     def self.empty_fields
       "\nCanceled: couldn't get enough information (empty field).\n\n".color(:red)
@@ -287,5 +287,11 @@ module Ayadn
     def self.no_curl
       "\n\nAyadn needs 'curl' to upload files. Please install 'curl' (or check that it's properly declared in your $PATH).\n\n".color(:red)
     end
+    def self.itunes_store
+      "Fetching informations from the Itunes Store...\n".color(:green)
+    end
+    def self.fetching_from source
+      "\nFetching informations from #{source}...\n".color(:green)
+    end
   end
 end