ayadn 1.8.2 → 2.0

data/lib/ayadn/stream.rb

@@ -7,17 +7,19 @@ module Ayadn
       @api = api
       @view = view
       @workers = workers
+      @check = Check.new
+      @status = Status.new
     end
 
     def global settings
-      Settings.options[:force] = true if settings[:force]
+      Settings.global[:force] = true if settings[:force]
       options = settings.dup
       options[:filter] = nicerank_true()
       @view.downloading(options)
       unless options[:scroll]
         stream = @api.get_global(options)
-        Settings.options[:force] == true ? niceranks = {} : niceranks = NiceRank.new.get_ranks(stream)
-        Check.no_new_posts(stream, options, 'global')
+        Settings.global[:force] == true ? niceranks = {} : niceranks = NiceRank.new.get_ranks(stream)
+        @check.no_new_posts(stream, options, 'global')
         Databases.save_max_id(stream, 'global') unless stream['meta']['max_id'].nil?
         @view.render(stream, options, niceranks)
       end
@@ -43,11 +45,11 @@ module Ayadn
     end
 
     def stream meth, options, target
-      Settings.options[:force] = true if options[:force]
+      Settings.global[:force] = true if options[:force]
       @view.downloading(options)
       unless options[:scroll]
         stream = @api.send("get_#{meth}".to_sym, options)
-        Check.no_new_posts(stream, options, target)
+        @check.no_new_posts(stream, options, target)
         Databases.save_max_id(stream)
         @view.render(stream, options)
       end
@@ -60,15 +62,15 @@ module Ayadn
 
 
     def mentions username, options
-      Settings.options[:force] = true if options[:force]
-      Check.no_username(username)
+      Settings.global[:force] = true if options[:force]
+      @check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       unless options[:scroll]
         stream = @api.get_mentions(username, options)
-        Check.no_user(stream, username)
+        @check.no_user(stream, username)
         Databases.save_max_id(stream)
-        Check.no_data(stream, 'mentions')
+        @check.no_data(stream, 'mentions')
         options = options.dup
         options[:in_mentions] = true
         @view.render(stream, options)
@@ -81,16 +83,28 @@ module Ayadn
     end
 
     def posts username, options
-      Settings.options[:force] = true if options[:force]
-      Check.no_username(username)
+      Settings.global[:force] = true if options[:force]
+      @check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       stream = @api.get_posts(username, options)
-      Check.no_user(stream, username)
+      @check.no_user(stream, username)
       Databases.save_max_id(stream) unless stream['meta']['marker'].nil?
-      Check.no_data(stream, 'mentions')
-      if Databases.blacklist["-#{username.downcase}"] || stream['data'][0]['user']['you_muted'] || stream['data'][0]['user']['you_blocked']
-        abort(Status.no_force("#{username.downcase}")) unless options[:raw] || Settings.options[:force]
+      @check.no_data(stream, 'mentions')
+      unless options[:raw] || Settings.global[:force]
+        # this is just to show a message rather than an empty screen
+        if Settings.options[:blacklist][:active] == true
+          if Databases.is_in_blacklist?('mention', username)
+            @status.no_force("#{username.downcase}")
+            exit
+          end
+        end
+      end
+      if stream['data'][0]['user']['you_muted'] || stream['data'][0]['user']['you_blocked']
+        unless options[:raw] || Settings.global[:force]
+          @status.no_force("#{username.downcase}")
+          exit
+        end
       end
       @view.render(stream, options)
       Scroll.new(@api, @view).posts(username, options) if options[:scroll]
@@ -98,36 +112,37 @@ module Ayadn
     end
 
     def whatstarred(username, options)
-      Check.no_username(username)
+      @check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       stream = @api.get_whatstarred(username, options)
-      Check.no_user(stream, username)
-      Check.no_data(stream, 'whatstarred')
+      @check.no_user(stream, username)
+      @check.no_data(stream, 'whatstarred')
       options[:extract] ? @view.all_stars_links(stream) : @view.render(stream, options)
+      puts "\n" if Settings.options[:timeline][:compact] == true
     end
 
     def followings(username, options)
-      Check.no_username(username)
+      @check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       show_raw_list(username, :followings, options)
       list = @api.get_followings(username)
-      Check.auto_save_followings(list)
+      @check.auto_save_followings(list)
       Errors.no_data('followings') if list.empty?
-      @view.list(:followings, list, username)
+      @view.list(:followings, list, username, options)
       Databases.add_to_users_db_from_list(list)
     end
 
     def followers(username, options)
-      Check.no_username(username)
+      @check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       show_raw_list(username, :followers, options)
       list = @api.get_followers(username)
-      Check.auto_save_followers(list)
+      @check.auto_save_followers(list)
       Errors.no_data('followers') if list.empty?
-      @view.list(:followers, list, username)
+      @view.list(:followers, list, username, options)
       Databases.add_to_users_db_from_list(list)
     end
 
@@ -135,9 +150,9 @@ module Ayadn
       @view.downloading(options)
       show_raw_list(nil, :muted, options)
       list = @api.get_muted
-      Check.auto_save_muted(list)
+      @check.auto_save_muted(list)
       Errors.no_data('muted') if list.empty?
-      @view.list(:muted, list, nil)
+      @view.list(:muted, list, nil, options)
       Databases.add_to_users_db_from_list(list)
     end
 
@@ -146,7 +161,7 @@ module Ayadn
       show_raw_list(nil, :blocked, options)
       list = @api.get_blocked
       Errors.no_data('blocked') if list.empty?
-      @view.list(:blocked, list, nil)
+      @view.list(:blocked, list, nil, options)
       Databases.add_to_users_db_from_list(list)
     end
 
@@ -156,42 +171,59 @@ module Ayadn
       @view.if_raw(stream, options)
       @view.clear_screen
       @view.show_interactions(stream['data'])
+      puts "\n" if Settings.options[:timeline][:compact] == true
     end
 
     def whoreposted(post_id, options)
-      Check.bad_post_id(post_id)
+      @check.bad_post_id(post_id)
+      unless options[:force]
+        post_id = @workers.get_real_post_id(post_id)
+      end
       @view.downloading(options)
       details = @api.get_details(post_id, options)
-      Check.no_post(details, post_id)
+      @check.no_post(details, post_id)
       id = @workers.get_original_id(post_id, details)
       list = @api.get_whoreposted(id)
       @view.if_raw(list, options)
-      abort(Status.nobody_reposted) if list['data'].empty?
+      if list['data'].empty?
+        @status.nobody_reposted
+        exit
+      end
       @view.list(:whoreposted, list['data'], post_id)
     end
 
     def whostarred(post_id, options)
-      Check.bad_post_id(post_id)
+      @check.bad_post_id(post_id)
+      unless options[:force]
+        post_id = @workers.get_real_post_id(post_id)
+      end
       @view.downloading(options)
       details = @api.get_details(post_id, options)
-      Check.no_post(details, post_id)
+      @check.no_post(details, post_id)
       id = @workers.get_original_id(post_id, details)
       list = @api.get_whostarred(id)
       @view.if_raw(list, options)
-      abort(Status.nobody_starred) if list['data'].empty?
+      if list['data'].empty?
+        @status.nobody_starred
+        exit
+      end
       @view.list(:whostarred, list['data'], id)
     end
 
     def convo(post_id, options)
-      Settings.options[:force] = true if options[:force]
-      Check.bad_post_id(post_id)
+      @check.bad_post_id(post_id)
+      if options[:force]
+        Settings.global[:force] = true
+      else
+        post_id = @workers.get_real_post_id(post_id)
+      end
       @view.downloading(options)
       details = @api.get_details(post_id, options)
-      Check.no_post(details, post_id)
+      @check.no_post(details, post_id)
       id = @workers.get_original_id(post_id, details)
       stream = @api.get_convo(id, options)
-      Check.no_post(stream, id)
-      Databases.pagination["replies:#{id}"] = stream['meta']['max_id']
+      @check.no_post(stream, id)
+      Databases.pagination_insert("replies:#{id}", stream['meta']['max_id'])
       options = options.dup
       options[:reply_to] = details['data']['reply_to'].to_i unless details['data']['reply_to'].nil?
       options[:post_id] = post_id.to_i
@@ -202,14 +234,14 @@ module Ayadn
 
     def messages(channel_id, options)
       if options[:silent]
-        Settings.options[:marker][:update_messages] = false
+        Settings.options[:marker][:messages] = false
       end
       channel_id = @workers.get_channel_id_from_alias(channel_id)
       @view.downloading(options)
       resp = @api.get_messages(channel_id, options)
       name = "channel:#{channel_id}"
-      Check.no_new_posts(resp, options, name)
-      if Settings.options[:marker][:update_messages] == true
+      @check.no_new_posts(resp, options, name)
+      if Settings.options[:marker][:messages] == true
         unless resp['meta']['max_id'].nil?
           marked = @api.update_marker(name, resp['meta']['max_id'])
           updated = JSON.parse(marked)
@@ -220,22 +252,23 @@ module Ayadn
       end
       Databases.save_max_id(resp)
       @view.if_raw(resp, options)
-      Check.no_data(resp, 'messages') unless options[:scroll]
+      @check.no_data(resp, 'messages') unless options[:scroll]
       @view.render(resp, options)
       Scroll.new(@api, @view).messages(channel_id, options) if options[:scroll]
       puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
     def random_posts(options)
+      Settings.global[:force] = true
       #_, cols = @view.winsize
       #max_posts = cols / 16
       max_posts = 6
       @view.clear_screen
-      puts "Fetching random posts, please wait...".color(:cyan)
+      @status.info("connected", "fetching random posts", "cyan")
       @max_id = @api.get_global({count: 1})['meta']['max_id'].to_i
       @view.clear_screen
       counter = 1
-      wait = options[:wait] || 5
+      wait = options[:wait] || 10
       loop do
         begin
           @random_post_id = rand(@max_id)
@@ -245,14 +278,15 @@ module Ayadn
           counter += 1
           if counter == max_posts
             wait.downto(1) do |i|
-              print "\r#{sprintf("%02d", i)} sec... QUIT WITH [CTRL+C]".color(:cyan)
+              print "\r#{sprintf("%02d", i)} sec... ([CTRL+C] to quit)".color(:cyan)
               sleep 1
             end
             @view.clear_screen
             counter = 1
           end
         rescue Interrupt
-          abort(Status.canceled)
+          @status.canceled
+          exit
         end
       end
     end

data/lib/ayadn/switch.rb

@@ -2,72 +2,76 @@
 module Ayadn
   class Switch
 
+    def initialize
+      @thor = Thor::Shell::Color.new # local statuses
+      @status = Status.new # global statuses + utils
+      @acc_db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
+    end
+
     def list
-      home_path = Dir.home + "/ayadn"
-      if File.exist?("#{home_path}/accounts.db")
-        accounts_db = Databases.init("#{home_path}/accounts.db")
-        active = accounts_db['ACTIVE']
-        begin
-          puts "\nCurrently authorized accounts:\n".color(:cyan)
-          accounts_db.each do |acc|
-            next if acc[0] == 'ACTIVE'
-            if acc[1][:username] == active
-              puts "#{acc[1][:handle]}".color(:red)
-            else
-              puts "#{acc[1][:handle]}".color(:green)
-            end
-          end
-          puts "\n"
-        ensure
-          close_db(accounts_db)
+      puts "\n"
+      accounts = Databases.all_accounts(@acc_db)
+      please if accounts.empty?
+      accounts.sort_by! { |acc| acc[0] }
+      table = Terminal::Table.new do |t|
+        t.style = { :width => 80 }
+        t.title = "Ayadn accounts"
+        t.headings = ['Username', 'ID', 'Path']
+      end
+      accounts.each do |acc|
+        username = acc[2]
+        id = acc[1].to_s
+        path = "~/ayadn/#{File.basename(acc[3])}"
+        if acc[4] == 1
+          username = username.color(:green)
+          id = id.color(:green)
+          path = path.color(:green)
         end
-      else
-        please
+        table << [username, id, path]
       end
+      puts table
+      puts "\n"
     end
 
     def switch(user)
       if user.empty? || user.nil?
-        puts "\n\nOops, something went wrong, I couldn't get your username. Please try again.\n\n".color(:red)
+        @status.no_username
         exit
       end
-      #puts "\e[H\e[2J"
       username = Workers.new.remove_arobase_if_present([user.first])[0]
-      home_path = Dir.home + "/ayadn"
-      if File.exist?("#{home_path}/accounts.db")
-        accounts_db = Databases.init("#{home_path}/accounts.db")
-        active = accounts_db['ACTIVE']
-        if username == accounts_db[active][:username]
-          puts "\nYou're already authorized with username '#{accounts_db[active][:handle]}'.\n".color(:red)
-          cancel(accounts_db)
+      accounts = Databases.all_accounts(@acc_db)
+      please if accounts.empty?
+      active = accounts.select { |acc| acc[4] == 1 }[0]
+      active_user = active[0]
+      if username == active_user
+        @status.say do
+          @thor.say_status :done, "already authorized with username @#{username}", :green
         end
-        if accounts_db[username]
-          puts "\nSwitching to account @#{username}...".color(:green)
-          accounts_db['ACTIVE'] = username
-          close_db(accounts_db)
-          puts Status.done
-          exit
-        else
-          puts "\nThis account isn't in the database. Please run 'ayadn authorize'.\n".color(:red)
-          cancel(accounts_db)
+        exit
+      end
+      flag = accounts.select { |acc| acc[0] == username }.flatten
+      if flag.empty?
+        @status.say do
+          @thor.say_status :error, "@#{username} isn't in the database", :red
+          @thor.say_status :next, "please run `ayadn -auth` to authorize this account", :yellow
         end
+        exit
       else
-        please
+        @status.say do
+          @thor.say_status :switching, "from @#{active_user} to @#{username}", :cyan
+          Databases.set_active_account(@acc_db, username)
+          @thor.say_status :done, "@#{username} is now the active account", :green
+        end
+        exit
       end
     end
 
     private
 
-    def cancel(accounts_db)
-      accounts_db.close
-      exit
-    end
-    def close_db(db)
-      db.flush
-      db.close
-    end
     def please
-      puts "\nPlease run 'ayadn authorize' first.\n".color(:red)
+      @status.say do
+        @thor.say_status :error, "please run `ayadn -auth` to authorize an account", :red
+      end
       exit
     end
   end

data/lib/ayadn/tvshow.rb

@@ -3,7 +3,13 @@ module Ayadn
 
   class TvShow
 
-    require 'tvdb_party'
+    begin
+      require 'tvdb_party'
+    rescue LoadError => e
+      puts "\nAYADN: Error while loading Gems\n\n"
+      puts "RUBY: #{e}\n\n"
+      exit
+    end
 
     AYADN_TVDB_API_KEY = 'E874ACBC542CAA53'
 
@@ -13,28 +19,37 @@ module Ayadn
       @language = 'en'
       @view = View.new
       @tvdb = TvdbParty::Search.new(AYADN_TVDB_API_KEY)
+      @status = Status.new
     end
 
     def find title
       res = find_all(title)
-      abort(Status.no_show) if res[0].nil?
+      if res[0].nil?
+        @status.no_show
+        exit
+      end
       if res[0].has_key?('FirstAired')
         return @tvdb.get_series_by_id(res[0]['seriesid'])
       else
         return @tvdb.get_series_by_id(res[1]['seriesid']) unless res[1].nil?
       end
-      abort(Status.no_show)
+      @status.no_show
+      exit
     end
 
     def find_alt title
       res = find_all(title)
-      abort(Status.no_show) if res[0].nil?
+      if res[0].nil?
+        @status.no_show
+        exit
+      end
       if res[0].has_key?('FirstAired')
         return @tvdb.get_series_by_id(res[1]['seriesid']) unless res[1].nil?
       else
         return @tvdb.get_series_by_id(res[2]['seriesid']) unless res[2].nil?
       end
-      abort(Status.no_show)
+      @status.no_show
+      exit
     end
 
     def create_details show_obj
@@ -65,10 +80,15 @@ module Ayadn
 
     def ok
       @view.clear_screen
-      puts Status.writing
-      puts "\nYour post:\n\n".color(:cyan)
-      puts @text
-      puts "\n\nIs it ok? (y/N)".color(:yellow)
+      @status.writing
+      @status.to_be_posted
+      thor = Thor::Shell::Basic.new
+      puts "\n"
+      @text.split("\n").each do |line|
+        thor.say_status(nil, line.color(Settings.options[:colors][:excerpt]))
+      end
+      puts "\n"
+      @status.ok?
       STDIN.getch == ("y" || "Y") ? true : false
     end
 
@@ -82,7 +102,7 @@ module Ayadn
         FileOps.download_url(filename, @poster_url)
       end
       @view.clear_screen
-      puts "\nPosting and uploading the show poster...\n".color(:green)
+      @status.info("uploading", "show poster", "yellow")
       options[:embed] = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
       options[:tvshow] = true
       dic = {
@@ -92,14 +112,16 @@ module Ayadn
         source: 'TVDb'
       }
       resp = Post.new.post(dic)
-      FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+      FileOps.save_post(resp) if Settings.options[:backup][:posts]
       @view.clear_screen
-      puts Status.yourpost
+      @status.yourpost
+      puts "\n\n"
       @view.show_posted(resp)
     end
 
     def cancel
-      abort(Status.canceled)
+      @status.canceled
+      exit
     end
 
     private
@@ -110,12 +132,22 @@ module Ayadn
 
     def find_poster_url show_obj
       poster = show_obj.posters(@language).first
-      poster.nil? ? abort(Status.no_show_infos) : poster.url
+      if poster.nil?
+        @status.no_show_infos
+        exit
+      else
+        poster.url
+      end
     end
 
     def find_banner_url show_obj
       banner = show_obj.series_banners(@language).first
-      banner.nil? ? abort(Status.no_show_infos) : banner.url
+      if banner.nil?
+        @status.no_show_infos
+        exit
+      else
+        banner.url
+      end
     end
 
     def find_plot show_obj

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.8.2"
+  VERSION = "2.0"
 end