ayadn 1.8.2 → 2.0

data/lib/ayadn/endpoints.rb

@@ -56,7 +56,7 @@ module Ayadn
       else
         API.build_query({count: Settings.options[:counts][:global]})
       end
-      if Settings.options[:force]
+      if Settings.global[:force] == true
         "#{@posts_url}stream/global?#{@options_list}"
       else
         "#{@posts_url}stream/global?access_token=#{Settings.user_token}#{@options_list}"
@@ -105,7 +105,7 @@ module Ayadn
       else
         API.build_query({count: Settings.options[:counts][:posts]})
       end
-      if Settings.options[:force]
+      if Settings.global[:force] == true
         "#{@users_url}#{username}/posts/?#{@options_list}"
       else
         "#{@users_url}#{username}/posts/?access_token=#{Settings.user_token}#{@options_list}"

data/lib/ayadn/errors.rb

@@ -3,7 +3,11 @@ module Ayadn
   class Errors
 
     def self.global_error(args)
-      abort(Status.wtf) if Logs.nil? || Logs.rec.nil?
+      if Logs.nil? || Logs.rec.nil?
+        Status.new.wtf
+        exit
+      end
+      thor = Thor::Shell::Color.new
       Logs.rec.error "--BEGIN--"
       Logs.rec.error "CAUSE: #{args[:error]}"
       Logs.rec.debug "DATA: #{args[:data]}"
@@ -14,9 +18,9 @@ module Ayadn
         "#{dir}/#{file}"
       end
       Logs.rec.debug "STACK: #{stack}"
-      #Logs.rec.debug "STACK: #{args[:caller]}"
       Logs.rec.error "--END--"
-      puts "\nError logged in #{Settings.config[:paths][:log]}/ayadn.log\n".color(:blue)
+      thor.say_status :error, "logged in #{Settings.config[:paths][:log]}/ayadn.log", :red
+      puts "\n"
       Debug.err(args[:error], stack)
       exit
     end
@@ -41,14 +45,10 @@ module Ayadn
       Logs.nr.warn msg
     end
 
-    def self.whine(status, resp)
-      puts status
-      self.error("#{status} => #{resp['meta']}")
-    end
-
     def self.no_data(where)
       self.warn "In action/#{where}: no data"
-      abort(Status.empty_list)
+      Status.new.empty_list
+      exit
     end
 
   end

data/lib/ayadn/extend.rb

@@ -1,7 +1,14 @@
 # encoding: utf-8
 class String
   def is_integer?
-    self.to_i.to_s == self
+    begin
+      temp = self.to_i.to_s
+      return false if temp == "0"
+      Integer(temp)
+      return true
+    rescue ArgumentError
+      return false
+    end
   end
 end
 class Integer

data/lib/ayadn/fileops.rb

@@ -34,10 +34,6 @@ module Ayadn
       File.write(Settings.config[:paths][:downloads] + "/#{name}", file)
     end
 
-    def self.old_ayadn?
-      Dir.exist?(Dir.home + "/ayadn/data")
-    end
-
     def self.upload_files files
       files.map do |file|
         puts "\n#{file}\n\n"
@@ -56,13 +52,17 @@ module Ayadn
           `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file}" -F 'public=true' -X POST`
         end
       rescue Errno::ENOENT
-        abort(Status.no_curl)
+        Status.new.no_curl
+        exit
       end
     end
 
     def self.make_paths(files_array)
       files_array.map do |file|
-        abort(Status.bad_path) unless File.exist?(file)
+        unless File.exist?(file)
+          Status.new.bad_path
+          exit
+        end
         File.absolute_path(file)
       end
     end
@@ -71,7 +71,8 @@ module Ayadn
       begin
         `curl -X POST -H "Authorization: Bearer #{Settings.user_token}" -F "avatar=@#{file}" #{Endpoints.new.avatar}`
       rescue Errno::ENOENT
-        abort(Status.no_curl)
+        Status.new.no_curl
+        exit
       end
     end
 
@@ -79,7 +80,8 @@ module Ayadn
       begin
         `curl -X POST -H "Authorization: Bearer #{Settings.user_token}" -F "cover=@#{file}" #{Endpoints.new.cover}`
       rescue Errno::ENOENT
-        abort(Status.no_curl)
+        Status.new.no_curl
+        exit
       end
     end
 

data/lib/ayadn/mark.rb

@@ -5,21 +5,29 @@ module Ayadn
     desc "add POST_ID (TITLE)", "Create a bookmark for this conversation"
     long_desc Descriptions.mark_add
     map "create" => :add
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def add(*args)
       begin
         init
+        status = Status.new
         unless args.empty?
           double = args.dup
           post_id, convo_title = double.shift, double.join(' ')
         else
-          abort Status.wrong_arguments
+          status.wrong_arguments
+          exit
+        end
+        Check.new.bad_post_id(post_id)
+        if options[:force]
+          Settings.global[:force] = true
+        else
+          post_id = Workers.new.get_real_post_id(post_id)
         end
-        abort Status.error_missing_post_id unless post_id.is_integer?
         convo_title = post_id if convo_title == ''
         api, workers, view = API.new, Workers.new, View.new
         users, bucket = [], []
         view.clear_screen
-        puts "\nAnalyzing conversation...\n".inverse
+        status.info(:connected, "analyzing conversation", :yellow)
         resp = api.get_convo(post_id, options)
         posts = workers.build_posts(resp['data'].reverse)
         posts.each do |id, post|
@@ -30,31 +38,29 @@ module Ayadn
         users.uniq!
         now = Time.now.to_s
         bookmark = {
-          id: post_id,
-          root_id: bucket[0][:id],
-          last_id: (bucket.last)[:id],
-          title: convo_title,
-          first_date: bucket[0][:date],
-          last_date: (bucket.last)[:date],
-          mark_date: now[0..18],
-          first_poster: bucket[0][:original_poster],
-          last_poster: (bucket.last)[:username],
-          users: users,
-          size: bucket.length,
-          url: bucket[0][:canonical_url],
-          root_text: bucket[0][:raw_text],
-          root_colorized_text: bucket[0][:text]
+          'id' => post_id,
+          'root_id' => bucket[0][:id],
+          'last_id' => (bucket.last)[:id],
+          'title' => convo_title,
+          'first_date' => bucket[0][:date],
+          'last_date' => (bucket.last)[:date],
+          'mark_date' => now[0..18],
+          'first_poster' => bucket[0][:original_poster],
+          'last_poster' => (bucket.last)[:username],
+          'users' => users,
+          'size' => bucket.length,
+          'url' => bucket[0][:canonical_url],
+          'root_text' => bucket[0][:raw_text],
+          'root_colorized_text' => bucket[0][:text]
         }
         view.clear_screen
-        puts "Bookmarked conversation:\n".color(:green)
+        status.info(:done, "bookmarked conversation:", :green)
         puts make_entry bookmark
         Databases.add_bookmark bookmark
-        Logs.rec.info "Added conversation bookmark for post #{bookmark[:id]}."
-        puts Status.done
+        Logs.rec.info "Added conversation bookmark for post #{bookmark['id']}."
+        status.done
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -64,18 +70,19 @@ module Ayadn
     def list
       begin
         init
-        list = []
-        Databases.bookmarks.each {|i,v| list << v}
+        list = Databases.all_bookmarks
         if options[:raw]
           jj JSON.parse(list.to_json)
           exit
         end
+        if list.empty?
+          Status.new.empty_list
+          exit
+        end
         puts "\n"
-        list.each {|marked| puts make_entry marked; puts "\n"}
+        list.each {|marked| puts make_entry(JSON.parse(marked[1])); puts "\n"}
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args, options]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -83,56 +90,72 @@ module Ayadn
     def clear
       begin
         init
-        puts "\n\nAre you sure you want to erase all the content of your bookmarks database?\n\n[y/N]\n".color(:red)
+        status = Status.new
+        status.ask_clear_bookmarks
         input = STDIN.getch
         if input == 'y' || input == 'Y'
           Databases.clear_bookmarks
           Logs.rec.info "Cleared the bookmarks database."
-          puts Status.done
+          status.done
         else
-          abort Status.canceled
+          status.canceled
+          exit
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: []})
-      ensure
-        Databases.close_all
       end
     end
 
     desc "delete POST_ID", "Delete entry POST_ID from your bookmarked conversations"
     map "remove" => :delete
     long_desc Descriptions.mark_delete
-    def delete *args
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def delete(*args)
       begin
         init
-        args.empty? ? abort(Status.wrong_arguments) : post_id = args[0]
-        abort Status.error_missing_post_id unless post_id.is_integer?
+        status = Status.new
+        if args.empty?
+          status.wrong_arguments
+          exit
+        else
+          post_id = args[0]
+        end
+        Check.new.bad_post_id(post_id)
+        if options[:force]
+          Settings.global[:force] = true
+        else
+          post_id = Workers.new.get_real_post_id(post_id)
+        end
         Databases.delete_bookmark post_id
-        puts Status.done
+        status.done
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
       end
     end
 
     desc "rename POST_ID NEW_TITLE", "Rename bookmark POST_ID"
     long_desc Descriptions.mark_rename
-    def rename *args
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def rename(*args)
       begin
         init
+        status = Status.new
         unless args.empty? || args[1].nil?
-          post_id, new_title = args[0], args[1]
+          arguments = args.dup
+          post_id = arguments.shift
         else
           abort Status.wrong_arguments
         end
-        abort Status.error_missing_post_id unless post_id.is_integer?
-        Databases.rename_bookmark post_id, new_title
-        puts Status.done
+        Check.new.bad_post_id(post_id)
+        if options[:force]
+          Settings.global[:force] = true
+        else
+          post_id = Workers.new.get_real_post_id(post_id)
+        end
+        Databases.rename_bookmark post_id, arguments.join(" ")
+        status.done
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -141,27 +164,27 @@ module Ayadn
     def make_entry content
       entry = ""
       entry << "Post id:".color(:cyan)
-      entry << "\t#{content[:id]}\n".color(Settings.options[:colors][:username])
-      unless content[:title].is_integer?
+      entry << "\t#{content['id']}\n".color(Settings.options[:colors][:username])
+      unless content['title'].is_integer?
         entry << "Title:".color(:cyan)
-        entry << "\t\t#{content[:title]}\n".color(Settings.options[:colors][:id])
+        entry << "\t\t#{content['title']}\n".color(Settings.options[:colors][:id])
       end
       entry << "Date:".color(:cyan)
-      entry << "\t\t#{content[:first_date]}\n".color(Settings.options[:colors][:date])
+      entry << "\t\t#{content['first_date']}\n".color(Settings.options[:colors][:date])
       # entry << "Bookmarked:".color(:cyan)
-      # entry << "\t#{content[:mark_date]}\n".color(Settings.options[:colors][:date])
+      # entry << "\t#{content['mark_date']}\n".color(Settings.options[:colors][:date])
       entry << "Posts:".color(:cyan)
-      entry << "\t\t#{content[:size]}\n".color(Settings.options[:colors][:name])
+      entry << "\t\t#{content['size']}\n".color(Settings.options[:colors][:name])
       entry << "Posters:".color(:cyan)
       posters = []
-      content[:users].each {|mention| posters << "@#{mention}"}
+      content['users'].each {|mention| posters << "@#{mention}"}
       entry << "\t#{posters.join(', ')}\n".color(Settings.options[:colors][:mentions])
-      # entry << "First:\t\t@#{content[:first_poster]}\n"
-      # entry << "Last:\t\t@#{content[:last_poster]}\n"
+      # entry << "First:\t\t@#{content['first_poster']}\n"
+      # entry << "Last:\t\t@#{content['last_poster']}\n"
       entry << "Link:".color(:cyan)
-      entry << "\t\t#{content[:url]}\n".color(Settings.options[:colors][:link])
+      entry << "\t\t#{content['url']}\n".color(Settings.options[:colors][:link])
       entry << "Beginning:".color(:cyan)
-      text = content[:root_text].gsub(/[\r\n]/, ' ')
+      text = content['root_text'].gsub(/[\r\n]/, ' ')
       if text.length <= 60
         entry << "\t#{text}\n"
       else