ayadn 1.8.2 → 2.0

data/lib/ayadn/authorize.rb

@@ -2,50 +2,95 @@
 module Ayadn
   class Authorize
 
+    def initialize
+      @thor = Thor::Shell::Color.new # local statuses
+      @status = Status.new # global statuses + utils
+    end
+
     def authorize
+      puts "\n"
+      if File.exist?(Dir.home + "/ayadn/accounts.db")
+        @status.has_to_migrate
+        exit
+      end
       puts "\e[H\e[2J"
-      try_remove_old_ayadn
       show_link
       token = get_token
       check_token(token)
-      puts "\n\nThanks! Contacting App.net...\n".color(:green)
+      puts "\e[H\e[2J"
+      @thor.say_status :connexion, "downloading user info", :yellow
       user = create_user_data(token, Dir.home + "/ayadn")
       prepare(user)
-      puts "Creating configuration...\n".color(:green)
+      @thor.say_status :create, "configuration", :yellow
       Settings.load_config
       Logs.create_logger
       install
-      puts Status.done
-      Errors.info "Done!"
-      puts "\nThank you for using Ayadn. Enjoy!\n\n".color(:yellow)
+      @thor.say_status :done, "user #{user.handle} is authorized", :green
+      Errors.info "#{user.handle} authorized."
+      @status.say { @thor.say_status :end, "Thank you for using Ayadn. Enjoy!", :green }
+      Switch.new.list
+    end
+
+    def unauthorize(user, options)
+      begin
+        @workers = Workers.new
+        if user.size > 1
+          @status.one_username
+          exit
+        end
+        user = @workers.remove_arobase_if_present(user)[0]
+        puts "\e[H\e[2J"
+        if options[:delete]
+          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} and delete its folders?\n\n> ", :red)
+        else
+          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} ?\n\n> ", :red)
+        end
+        unless sure == true
+          Status.new.canceled
+          exit
+        end
+        puts "\e[H\e[2J"
+        @thor.say_status :delete, "database entry for @#{user}", :yellow
+        db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
+        Databases.remove_from_accounts(db, user)
+        if options[:delete]
+          @thor.say_status :delete, "@#{user} user folders", :yellow
+          FileUtils.remove_dir(Dir.home + "/ayadn/#{user}")
+        end
+        @thor.say_status :done, "user @#{user} has been unauthorized", :green
+        puts "\n"
+      rescue Interrupt
+        Status.new.canceled
+        exit
+      end
     end
 
     private
 
     def prepare(user)
-      puts "Ok! Creating Ayadn folders...\n".color(:green)
+      @thor.say_status :create, "user folders", :yellow
       create_config_folders(user)
-      puts "Saving user token...\n".color(:green)
+      @thor.say_status :save, "user token", :yellow
       create_token_file(user)
-      puts "Creating user account for #{user.handle}...\n".color(:green)
-      accounts_db = Databases.init("#{user.home_path}/accounts.db")
-      create_account(user, accounts_db)
+      @thor.say_status :create, "Ayadn account", :yellow
+      acc_db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
+      user_db = Amalgalite::Database.new("#{user.user_path}/db/ayadn.sqlite")
+      if user_db.schema.tables.empty?
+        Databases.create_tables(user)
+      end
+      if acc_db.schema.tables.empty?
+        Databases.create_account_table(acc_db)
+      end
+      Databases.create_account(acc_db, user)
     end
 
     def install
-      puts "Creating api and config files...\n".color(:green)
-      Errors.info "Creating api, version and config files..."
+      @thor.say_status :create, "api and config files", :yellow
+      Errors.info "Creating api and config files..."
       Errors.info "Creating version file..."
       Settings.init_config
     end
 
-    def create_account(user, accounts_db)
-      accounts_db[user.username] = {username: user.username, id: user.id, handle: user.handle, path: user.user_path}
-      accounts_db['ACTIVE'] = user.username
-      accounts_db.flush
-      accounts_db.close
-    end
-
     def create_token_file(user)
       File.write("#{user.user_path}/auth/token", user.token)
     end
@@ -53,70 +98,60 @@ module Ayadn
     def create_config_folders(user)
       begin
         FileUtils.mkdir_p(user.user_path)
-        %w{log db pagination config auth downloads backup posts messages lists}.each do |target|
+        %w{log db config auth downloads posts messages lists}.each do |target|
           Dir.mkdir("#{user.user_path}/#{target}") unless Dir.exist?("#{user.user_path}/#{target}")
         end
       rescue => e
-        puts "\nError creating Ayadn #{user.handle} account folders.\n\n"
-        puts "Error: #{e}"
+        @status.say do
+          @thor.say_status :error, "can't create #{user.handle} account folders", :red
+        end
+        @status.say { puts "\nError: #{e}" }
         exit
       end
     end
 
     def show_link
-      puts "\nPlease click this URL, or open a browser then copy/paste it:\n".color(:cyan)
-      puts Endpoints.new.authorize_url
-      puts "\n"
-      puts "On this page, log in with your App.net account to authorize Ayadn.\n".color(:cyan)
-      puts "You will then be redirected to a page showing a 'user token' (your secret code).\n".color(:cyan)
-      puts "Copy it then paste it here:\n".color(:yellow)
-      print "> "
+      @status.say do
+        @thor.say_status :please, "click or copy/paste this URL in a browser", :yellow
+        puts "\n"
+        puts "\t#{Endpoints.new.authorize_url}"
+        puts "\n"
+        @thor.say_status :next, "log in to authorize Ayadn", :cyan
+        @thor.say_status nil, "you will be redirected to your 'user token'"
+        @thor.say_status :please, "copy/paste the token here:", :yellow
+      end
+      print "\t> "
     end
 
     def get_user(token)
-      JSON.parse(RestClient.get("https://api.app.net/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
+      begin
+        JSON.parse(RestClient.get("https://api.app.net/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
+      rescue Exception => e
+        @status.say do
+          @thor.say_status :error, "connection problem", :red
+        end
+        puts "#{e}"
+      end
     end
 
     def get_token
       begin
         STDIN.gets.chomp()
       rescue Interrupt
-        puts Status.canceled
+        @status.canceled
         exit
       end
     end
 
     def check_token(token)
       if token.empty? || token.nil?
-        puts "\n\nOops, something went wrong, I couldn't get the token. Please try again.\n\n".color(:red)
-        exit
-      end
-    end
-
-    def try_remove_old_ayadn
-      if FileOps.old_ayadn?
-        answer = ask_del_old_ayadn
-        unless answer.downcase == "y"
-          puts Status.canceled
-          exit
-        end
-        puts "\nDeleting old version...\n".color(:green)
-        begin
-          old_dir = Dir.home + "/ayadn"
-          FileUtils.remove_dir(old_dir)
-        rescue => e
-          puts "Unable to remove folder: #{old_dir}\n\n".color(:red)
-          raise e
+        @status.say do
+          @thor.say_status :error, "couldn't get the token", :red
         end
+        exit
       end
     end
 
-    def ask_del_old_ayadn
-      puts "\nAn obsolete version of Ayadn has been detected and will be deleted. Install and authorize the new version? [y/N]\n".color(:red)
-      print "> "
-      STDIN.getch
-    end
-
     def create_user_data(token, home_path)
       resp = get_user(token)
       model = Struct.new(:resp, :username, :id, :handle, :home_path, :user_path, :token)

data/lib/ayadn/blacklist.rb

@@ -5,44 +5,44 @@ module Ayadn
     map "create" => :add
     long_desc Descriptions.blacklist_add
     def add(*args)
-      abort(Status.type_and_target_missing) if args.length < 2
+      if args.length < 2
+        Status.new.type_and_target_missing
+        exit
+      end
       BlacklistWorkers.new.add(args)
-      puts Status.done
+      Status.new.done
     end
 
     desc "remove TYPE TARGET", "Removes a mention, hashtag, client or username from your blacklist"
     map "delete" => :remove
     long_desc Descriptions.blacklist_remove
     def remove(*args)
-      abort(Status.type_and_target_missing) if args.length < 2
+      if args.length < 2
+        Status.new.type_and_target_missing
+        exit
+      end
       BlacklistWorkers.new.remove(args)
-      puts Status.done
+      Status.new.done
     end
 
     desc "list", "List the content of your blacklist"
     long_desc Descriptions.blacklist_list
     option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in CSV"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def list
       BlacklistWorkers.new.list(options)
     end
 
-    desc "import DATABASE", "Imports a blacklist database from another Ayadn account"
-    long_desc Descriptions.blacklist_import
-    def import(database)
-      BlacklistWorkers.new.import(database)
-    end
-
-    desc "convert", "Convert your current blacklist database to the new format"
-    long_desc Descriptions.blacklist_convert
-    def convert
-      BlacklistWorkers.new.convert
-      puts Status.done
-    end
+    # desc "import DATABASE", "Imports a blacklist database from another Ayadn account"
+    # long_desc Descriptions.blacklist_import
+    # def import(database)
+    #   BlacklistWorkers.new.import(database)
+    # end
 
     desc "clear", "Clear your blacklist database"
     def clear
       BlacklistWorkers.new.clear
-      puts Status.done
+      Status.new.done
     end
 
   end
@@ -56,39 +56,29 @@ module Ayadn
       Databases.open_databases
       @workers = Workers.new
     end
-    def import(database)
-      begin
-        new_db = File.realpath(database)
-        if File.exist?(new_db)
-          Databases.import_blacklist(new_db)
-          Logs.rec.info "Imported '#{new_db}' values in blacklist database."
-        else
-          puts "\nFile '#{new_db}' doesn't exist.\n\n".color(:red)
-          Logs.rec.warn "File '#{new_db}' doesn't exist."
-        end
-      ensure
-        Databases.close_all
-      end
-    end
-    def convert
-      begin
-        Databases.convert_blacklist
-      ensure
-        Databases.close_all
-      end
-    end
+    # def import(database)
+    #   begin
+    #     new_db = File.realpath(database)
+    #     if File.exist?(new_db)
+    #       Databases.import_blacklist(new_db)
+    #       Logs.rec.info "Imported '#{new_db}' values in blacklist database."
+    #     else
+    #       puts "\nFile '#{new_db}' doesn't exist.\n\n".color(:red)
+    #       Logs.rec.warn "File '#{new_db}' doesn't exist."
+    #     end
+    #   end
+    # end
     def clear
       begin
-        puts "\n\nAre you sure you want to erase all the content of your blacklist database?\n\n[y/N]\n".color(:red)
+        Status.new.ask_clear_blacklist
         input = STDIN.getch
         if input == 'y' || input == 'Y'
           Databases.clear_blacklist
           Logs.rec.info "Cleared the blacklist database."
         else
-          abort Status.canceled
+          Status.new.canceled
+          exit
         end
-      ensure
-        Databases.close_all
       end
     end
     def add(args)
@@ -96,24 +86,24 @@ module Ayadn
         type = args.shift
         case type
         when 'user', 'username', 'account'
+          target = @workers.remove_arobase_if_present(args)
+          Databases.add_to_blacklist('user', target)
           target = @workers.add_arobases_to_usernames args
-          Databases.add_user_to_blacklist(target)
           Logs.rec.info "Added '#{target}' to blacklist of users."
         when 'mention', 'mentions'
+          target = @workers.remove_arobase_if_present(args)
+          Databases.add_to_blacklist('mention', target)
           target = @workers.add_arobases_to_usernames args
-          Databases.add_mention_to_blacklist(target)
           Logs.rec.info "Added '#{target}' to blacklist of mentions."
         when 'client', 'source'
-          Databases.add_client_to_blacklist(args)
+          Databases.add_to_blacklist('client', args)
           Logs.rec.info "Added '#{args}' to blacklist of clients."
         when 'hashtag', 'tag'
-          Databases.add_hashtag_to_blacklist(args)
+          Databases.add_to_blacklist('hashtag', args)
           Logs.rec.info "Added '#{args}' to blacklist of hashtags."
         else
-          puts Status.wrong_arguments
+          Status.new.wrong_arguments
         end
-      ensure
-        Databases.close_all
       end
     end
     def remove(args)
@@ -121,44 +111,44 @@ module Ayadn
         type = args.shift
         case type
         when 'user', 'username', 'account'
-          temp = @workers.add_arobases_to_usernames args
-          target = temp.map {|u| "-#{u}"}
-          Databases.remove_from_blacklist(target)
+          Databases.remove_from_blacklist(args)
+          target = @workers.add_arobases_to_usernames(args)
           Logs.rec.info "Removed '#{target}' from blacklist of users."
         when 'mention', 'mentions'
-          target = @workers.add_arobases_to_usernames args
-          Databases.remove_from_blacklist(target)
+          Databases.remove_from_blacklist(args)
+          target = @workers.add_arobases_to_usernames(args)
           Logs.rec.info "Removed '#{target}' from blacklist of mentions."
         when 'client', 'source', 'hashtag', 'tag'
           Databases.remove_from_blacklist(args)
           Logs.rec.info "Removed '#{type}:#{args}' from blacklist."
         else
-          puts Status.wrong_arguments
+          Status.new.wrong_arguments
         end
-      ensure
-        Databases.close_all
       end
     end
     def list(options)
       begin
+        Settings.options[:timeline][:compact] = true if options[:compact] == true
         show_list(options)
-      ensure
-        Databases.close_all
       end
     end
 
     private
 
     def show_list(options)
-      list = Databases.blacklist
+      list = Databases.all_blacklist
       unless list.empty?
         if options[:raw]
-          list.each {|v,k| puts "#{v},#{k}"}
+          xx = list.map {|obj| [obj[0], obj[1].to_s.force_encoding("UTF-8")] }
+          puts xx.to_json
         else
+          puts "\n"
           puts Workers.new.build_blacklist_list(list)
+          puts "\n"
         end
       else
-        abort(Status.empty_list)
+        Status.new.empty_list
+        exit
       end
     end
   end