ayadn 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35b732787743af1ffb4606b914bce7e98eb8449
-  data.tar.gz: 80061c722394c97348aa4495f06d4ab1ac19b5b1
+  metadata.gz: bf33bfde8fef88cb0cfb82f45fd388fc05147539
+  data.tar.gz: 0a7ec547cdc0dccc4b4de1e852436d4448fc6687
 SHA512:
-  metadata.gz: db25cc0903fe97c2adf343790347f122f18d1a45b08e612bcea0ba9032c2927efa4beac0da5d25d1457b47ef28fc64bb7e7bd7add86c762c862912662d56d74c
-  data.tar.gz: 8cf1393082834771a438592dd83d0d1a257714311e7c755348bf6d9b42e4e0aa7b8da22baa0e05a4502749e9133c44857708001cfee2d33ec6dbf5c5db118a39
+  metadata.gz: 5e70d85dc634475b3cb2b3a238b7090a9e5d3a77017af178e76c0a50653cf52ab61fa8cdc7d9362cbce1e47830f9cc21b22b3062767d7bbab40b83ea587f82da
+  data.tar.gz: dd7958ee8d7a976ac3ddceb331d00c19adec0833a4f1bd8789f17c95f9de9e041833bfba74decce8bad2e736d23f0eed63d2129e714f60e09aed3e0cd676edef

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.10 - 2015-02-21 - 'Haneke'
+
+- New: cache results in Lists (and replay requests instantly)
+
 ## 2.0.9 - 2015-02-11 - 'Russel'
 
 - Fix: bug in add/remove user/mention to the blacklist

data/doc/05-streams.md

@@ -283,6 +283,14 @@ You can get your own stars by using *me* instead of *@username*:
 
 `ayadn -was me`
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -was --cache me`
+
+`ayadn -was --again me`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # CONVO
 
 Show the conversation thread around a specific post.

data/doc/08-listings.md

@@ -36,6 +36,14 @@ Force compact view (works with all compatible listing views):
 
 `ayadn -fwr -k me`
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -fwr --cache me`
+
+`ayadn -fwr --again me`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # FOLLOWINGS
 
 List the users a user is following.
@@ -80,6 +88,14 @@ Sort it by last post date:
 
 *Note: `-t` is ignored outside of 'last posts'. Other options are compatible with 'last posts' except `-r`.*
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -fwg --cache me`
+
+`ayadn -fwg --again me`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # CHANNELS
 
 List all your active App.net channels.
@@ -126,6 +142,30 @@ List users who reposted a post.
 
 `ayadn -wor 22790201`
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -wor --cache 22790201`
+
+`ayadn -wor --again 22790201`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
+# WHOSTARRED
+
+List users who starred a post.
+
+`ayadn whostarred 22790201`
+
+`ayadn -wos 22790201`
+
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -wos --cache 22790201`
+
+`ayadn -wos --again 22790201`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # MUTED
 
 List the users you muted.
@@ -156,6 +196,14 @@ Reverse the list order:
 
 `ayadn -mtd -u -r`
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -mtd --cache`
+
+`ayadn -mtd --again`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # BLOCKED
 
 List the users you blocked.
@@ -186,6 +234,14 @@ Reverse the list order:
 
 `ayadn -bkd -u -r`
 
+You can cache the results if you want to replay the same request again later and obtain the same results instantly:
+
+`ayadn -bkd --cache`
+
+`ayadn -bkd --again`
+
+*Note: `--cache` and `--again` don't have shortcuts.*
+
 # SETTINGS
 
 List current Ayadn settings.

data/lib/ayadn/api.rb

@@ -289,7 +289,27 @@ module Ayadn
     end
 
     def get_parsed_response(url)
-      JSON.parse(CNX.get_response_from(url))
+      working = true
+      begin
+        resp = JSON.parse(CNX.get_response_from(url))
+        return resp
+      rescue JSON::ParserError => e
+        if working == true
+          working = false
+          @status.server_error(true)
+          begin
+            sleep 10
+          rescue Interrupt
+            @status.canceled
+            exit
+          end
+          puts "\e[H\e[2J"
+          retry
+        else
+          @status.server_error(false)
+          Errors.global_error({error: e, caller: caller, data: [resp]})
+        end
+      end
     end
 
     def get_original_if_repost(resp)

data/lib/ayadn/app.rb

@@ -141,6 +141,8 @@ module Ayadn
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def whatstarred(*username)
       Action.new.whatstarred(username, options)
     end
@@ -151,6 +153,8 @@ module Ayadn
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: "Force retrieve the actual post id (ignores index)"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def whoreposted(post_id)
       Action.new.whoreposted(post_id, options)
     end
@@ -161,6 +165,8 @@ module Ayadn
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: "Force retrieve the actual post id (ignores index)"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def whostarred(post_id)
       Action.new.whostarred(post_id, options)
     end
@@ -190,6 +196,8 @@ module Ayadn
     option :date, aliases: "-t", type: :boolean, desc: "Sort the list by: date (only with 'lastposts' option)"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     option :lastpost, aliases: "-l", type: :boolean, desc: "Displays the last post of each user"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def followings(*username)
       Action.new.followings(username, options)
     end
@@ -204,6 +212,8 @@ module Ayadn
     option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def followers(*username)
       Action.new.followers(username, options)
     end
@@ -218,6 +228,8 @@ module Ayadn
     option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def muted
       Action.new.muted(options)
     end
@@ -232,6 +244,8 @@ module Ayadn
     option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
+    option :cache, type: :boolean, desc: "Cache the results"
+    option :again, type: :boolean, desc: "Run the last request from cache"
     def blocked
       Action.new.blocked(options)
     end

data/lib/ayadn/cnx.rb

@@ -115,31 +115,13 @@ module Ayadn
       case response.code
       when 200
         response
-      when 204
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
-      when 400
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
-      when 401
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
-      when 403
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
-      when 405
+      when 204, 400, 401, 403, 405, 500, 502, 504
         thor.say_status :error, message.upcase, :red
         Errors.global_error({error: message, caller: caller, data: [res]})
       when 429
         thor.say_status :error, message.upcase, :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({error: message, caller: caller, data: [res]})
-      when 500
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
-      when 507
-        thor.say_status :error, message.upcase, :red
-        Errors.global_error({error: message, caller: caller, data: [res]})
       else
         response
       end

data/lib/ayadn/fileops.rb

@@ -2,6 +2,20 @@
 module Ayadn
   class FileOps
 
+    def self.cache_list(list, name)
+      File.write(Settings.config[:paths][:lists] + "/.#{name}", list.to_json)
+    end
+
+    def self.cached_list(name)
+      file_path = Settings.config[:paths][:lists] + "/.#{name}"
+      if File.exist?(file_path)
+        data = File.read(file_path)
+        JSON.load(data)
+      else
+        nil
+      end
+    end
+
     def self.save_links(obj, name)
       File.write(Settings.config[:paths][:lists] + "/#{name}", obj.to_json)
     end

data/lib/ayadn/status.rb

@@ -527,6 +527,20 @@ module Ayadn
       @thor.say_status "next", "Ayadn will use these elements to insert album artwork and a link", :cyan
     end
 
+    def server_error(bool)
+      if bool == true
+        say do
+          @thor.say_status :error, "Ayadn couldn't get the JSON reponse", :red
+          @thor.say_status :next, "trying again in 10 seconds", :yellow
+        end
+      else
+        say do
+          @thor.say_status :error, "Ayadn couldn't get the JSON reponse", :red
+          @thor.say_status :status, "Current command canceled after one retry", :yellow
+        end
+      end
+    end
+
     ##---
 
     def info(status, message, color = nil)

data/lib/ayadn/stream.rb

@@ -114,23 +114,44 @@ module Ayadn
     def whatstarred(username, options)
       @check.no_username(username)
       username = @workers.add_arobase(username)
-      @view.downloading(options)
-      stream = @api.get_whatstarred(username, options)
+      @view.downloading(options) unless options["again"]
+
+      if options["again"]
+        stream = FileOps.cached_list("whatstarred")
+        Errors.no_data('cached whatstarred') if stream.nil?
+      else
+        stream = @api.get_whatstarred(username, options)
+      end
+
       @check.no_user(stream, username)
       @check.no_data(stream, 'whatstarred')
-      options[:extract] ? @view.all_stars_links(stream) : @view.render(stream, options)
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(stream, "whatstarred")
+      end
+
+      if options[:extract]
+        @view.all_stars_links(stream)
+      else
+        @view.render(stream, options)
+      end
       puts "\n" if Settings.options[:timeline][:compact] == true
     end
 
     def followings(username, options)
       @check.no_username(username)
       username = @workers.add_arobase(username)
-      @view.downloading(options)
+      @view.downloading(options) unless options["again"]
       show_raw_list(username, :followings, options)
-      list = @api.get_followings(username)
+      if options["again"]
+        list = FileOps.cached_list("followings")
+        Errors.no_data('cached followings') if list.nil?
+      else
+        list = @api.get_followings(username)
+      end
       @check.auto_save_followings(list)
       Errors.no_data('followings') if list.empty?
-      if options["lastpost"]
+      if options["lastpost"] && options["again"].nil?
         count = list.size
         @workers.thor.say_status :downloading, "please wait, it may take a while...", :red
         puts "\n"
@@ -145,6 +166,9 @@ module Ayadn
           obj << resp["data"][0]
         end
       end
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "followings")
+      end
       @view.list(:followings, list, username, options)
       Databases.add_to_users_db_from_list(list)
     end
@@ -152,29 +176,61 @@ module Ayadn
     def followers(username, options)
       @check.no_username(username)
       username = @workers.add_arobase(username)
-      @view.downloading(options)
+      @view.downloading(options) unless options["again"]
       show_raw_list(username, :followers, options)
-      list = @api.get_followers(username)
+
+      if options["again"]
+        list = FileOps.cached_list("followers")
+        Errors.no_data('cached followers') if list.nil?
+      else
+        list = @api.get_followers(username)
+      end
+
       @check.auto_save_followers(list)
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "followers")
+      end
+
       Errors.no_data('followers') if list.empty?
       @view.list(:followers, list, username, options)
       Databases.add_to_users_db_from_list(list)
     end
 
     def muted(options)
-      @view.downloading(options)
+      @view.downloading(options) unless options["again"]
       show_raw_list(nil, :muted, options)
-      list = @api.get_muted
+
+      if options["again"]
+        list = FileOps.cached_list("muted")
+        Errors.no_data('cached muted') if list.nil?
+      else
+        list = @api.get_muted
+      end
+
       @check.auto_save_muted(list)
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "muted")
+      end
+
       Errors.no_data('muted') if list.empty?
       @view.list(:muted, list, nil, options)
       Databases.add_to_users_db_from_list(list)
     end
 
     def blocked(options)
-      @view.downloading(options)
+      @view.downloading(options) unless options["again"]
       show_raw_list(nil, :blocked, options)
-      list = @api.get_blocked
+      if options["again"]
+        list = FileOps.cached_list("blocked")
+        Errors.no_data('cached blocked') if list.nil?
+      else
+        list = @api.get_blocked
+      end
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "blocked")
+      end
       Errors.no_data('blocked') if list.empty?
       @view.list(:blocked, list, nil, options)
       Databases.add_to_users_db_from_list(list)
@@ -194,11 +250,33 @@ module Ayadn
       unless options[:force]
         post_id = @workers.get_real_post_id(post_id)
       end
-      @view.downloading(options)
-      details = @api.get_details(post_id, options)
+      @view.downloading(options) unless options["again"]
+
+      if options["again"]
+        details = FileOps.cached_list("whoreposted_details")
+        Errors.no_data('cached whoreposted details') if details.nil?
+      else
+        details = @api.get_details(post_id, options)
+      end
+      
       @check.no_post(details, post_id)
       id = @workers.get_original_id(post_id, details)
-      list = @api.get_whoreposted(id)
+      
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(details, "whoreposted_details")
+      end
+
+      if options["again"]
+        list = FileOps.cached_list("whoreposted")
+        Errors.no_data('cached whoreposted') if list.nil?
+      else
+        list = @api.get_whoreposted(id)
+      end
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "whoreposted")
+      end
+      
       @view.if_raw(list, options)
       if list['data'].empty?
         @status.nobody_reposted
@@ -212,11 +290,33 @@ module Ayadn
       unless options[:force]
         post_id = @workers.get_real_post_id(post_id)
       end
-      @view.downloading(options)
-      details = @api.get_details(post_id, options)
+      @view.downloading(options) unless options["again"]
+
+      if options["again"]
+        details = FileOps.cached_list("whostarred_details")
+        Errors.no_data('cached whostarred details') if details.nil?
+      else
+        details = @api.get_details(post_id, options)
+      end
+
       @check.no_post(details, post_id)
       id = @workers.get_original_id(post_id, details)
-      list = @api.get_whostarred(id)
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(details, "whostarred_details")
+      end
+
+      if options["again"]
+        list = FileOps.cached_list("whostarred")
+        Errors.no_data('cached whostarred') if list.nil?
+      else
+        list = @api.get_whostarred(id)
+      end
+
+      if options["cache"] && options["again"].nil?
+        FileOps.cache_list(list, "whostarred")
+      end
+
       @view.if_raw(list, options)
       if list['data'].empty?
         @status.nobody_starred
@@ -310,7 +410,19 @@ module Ayadn
 
     def show_raw_list username, what, options
       if options[:raw]
-        @view.show_raw(@api.get_raw_list(username, what), options)
+
+        if options["again"]
+          list = FileOps.cached_list("#{username}_#{what}")
+          Errors.no_data("#{username}_#{what}") if list.nil?
+        else
+          list = @api.get_raw_list(username, what)
+        end
+
+        if options["cache"] && options["again"].nil?
+          FileOps.cache_list(list, "#{username}_#{what}")
+        end
+        
+        @view.show_raw(list, options)
         exit
       end
     end