ayadn 1.8.2 → 2.0

data/lib/ayadn/settings.rb

@@ -5,58 +5,63 @@ module Ayadn
     AYADN_CLIENT_ID = "hFsCGArAjgJkYBHTHbZnUvzTmL4vaLHL"
 
     class << self
-      attr_accessor :options, :config
-      attr_reader :user_token, :default_nr
+      attr_accessor :options, :config, :global
+      attr_reader :user_token
     end
 
     def self.load_config
-      acc_db = Dir.home + "/ayadn/accounts.db"
-      self.check_for_accounts(acc_db)
-      db = Databases.init acc_db
-      active = db['ACTIVE']
-      home = db[active][:path]
+      active = self.check_for_accounts
+      home = active[3]
       @config = {
         paths: {
           home: home,
           log: "#{home}/log",
           db: "#{home}/db",
-          pagination: "#{home}/pagination",
           config: "#{home}/config",
           auth: "#{home}/auth",
           downloads: "#{home}/downloads",
-          backup: "#{home}/backup",
           posts: "#{home}/posts",
           messages: "#{home}/messages",
           lists: "#{home}/lists"
         },
         identity: {
-          id: db[active][:id],
-          username: db[active][:username],
-          handle: db[active][:handle]
+          id: active[1],
+          username: active[0],
+          handle: active[2]
         }
       }
-      @default_nr = {
-        threshold: 2.1,
-        cache: 48,
-        filter: true,
-        filter_unranked: false
-      }
-      db.close
       @options = self.defaults
+      @global = {scrolling: false, force: false}
     end
 
-    def self.check_for_accounts(acc_db)
-      unless File.exist?(acc_db)
-        puts Status.not_authorized
-        exit
+    def self.check_for_accounts
+      sqlaccounts = Dir.home + "/ayadn/accounts.sqlite"
+      status = Status.new
+      if File.exist?(sqlaccounts)
+        # Ayadn 2.x with already authorized account(s)
+        return self.init_sqlite(sqlaccounts)
+      else
+        if File.exist?(Dir.home + "/ayadn/accounts.db")
+          # Ayadn 1.x with already authorized account(s)
+          status.has_to_migrate
+          exit
+        else
+          # Ayadn 1.x without any authorized account (gem installed but no ~/ayadn folder)
+          status.not_authorized
+          exit
+        end
       end
     end
 
+    def self.init_sqlite(sqlaccounts)
+      Databases.active_account(Amalgalite::Database.new(sqlaccounts))
+    end
+
     def self.get_token
       if self.has_token_file?
         @user_token = self.read_token_file
       else
-        puts Status.not_authorized
+        Status.new.not_authorized
         exit
       end
     end
@@ -87,27 +92,10 @@ module Ayadn
       config_file = @config[:paths][:config] + "/config.yml"
       if File.exist?(config_file)
         begin
-          conf = YAML.load(File.read(config_file))
-
-          # force delete obsolete keys (because legacy versions of the config file)
-          conf[:timeline].delete_if {|k,_| k == :show_nicerank}
-          conf[:colors].delete_if {|k,_| k == :nicerank}
-          # force create mandatory keys (idem)
-          conf[:nicerank] = @default_nr if conf[:nicerank].nil? || conf[:nicerank].size != 4
-          conf[:timeline][:show_debug] = false if conf[:timeline][:show_debug].nil?
-          conf[:timeline][:show_spinner] = true if conf[:timeline][:show_spinner].nil?
-          conf[:colors][:debug] = :red if conf[:colors][:debug].nil?
-          conf[:colors][:unread] = :cyan if conf[:colors][:unread].nil?
-          conf[:nowplaying] = {} if conf[:nowplaying].nil?
-          conf[:movie] = {hashtag: 'nowwatching'} if conf[:movie].nil?
-          conf[:tvshow] = {hashtag: 'nowwatching'} if conf[:tvshow].nil?
-          conf[:formats][:list] = {reverse: true} if conf[:formats][:list].nil?
-          conf[:timeline][:compact] = false if conf[:timeline][:compact].nil?
-          conf[:timeline][:show_channel_oembed] = true if conf[:timeline][:show_channel_oembed].nil?
-          conf[:marker] = {update_messages: true} if conf[:marker].nil?
-
-          @options = conf
-          self.write_config_file(config_file, @options)
+          # conf = YAML.load(File.read(config_file))
+          # @options = conf
+          @options = YAML.load(File.read(config_file))
+          # self.write_config_file(config_file, @options)
         rescue => e
           Errors.global_error({error: e, caller: caller, data: []})
         end
@@ -123,7 +111,9 @@ module Ayadn
     def self.create_api_file
       api_file = @config[:paths][:config] + "/api.json"
       if File.exist?(api_file)
-        if ( File.ctime(api_file) < (Time.now - 172800) ) #48h in secs
+        # should be 48h in secs (172800)
+        # but since ADN's API won't change any time soon...
+        if ( File.ctime(api_file) < (Time.now - 604800) )
           self.new_api_file(api_file)
         end
       else
@@ -171,21 +161,16 @@ module Ayadn
     def self.defaults
       {
         timeline: {
-          directed: 1,
-          deleted: 0,
-          html: 0,
-          annotations: true,
-          show_source: true,
-          show_symbols: true,
-          show_real_name: true,
-          show_date: true,
-          show_spinner: true,
-          show_debug: false,
-          show_channel_oembed: true,
+          directed: true,
+          source: true,
+          symbols: true,
+          name: true,
+          date: true,
+          debug: false,
           compact: false
         },
         marker: {
-          update_messages: true
+          messages: true
         },
         counts: {
           default: 50,
@@ -197,8 +182,8 @@ module Ayadn
           trending: 50,
           mentions: 50,
           convo: 50,
-          posts: 100,
-          messages: 50,
+          posts: 50,
+          messages: 20,
           search: 200,
           whoreposted: 20,
           whostarred: 20,
@@ -207,12 +192,16 @@ module Ayadn
         },
         formats: {
           table: {
-            width: 75
+            width: 75,
+            borders: true
           },
           list: {
             reverse: true
           }
         },
+        channels: {
+          links: true
+        },
         colors: {
           id: :blue,
           index: :red,
@@ -226,23 +215,33 @@ module Ayadn
           source: :cyan,
           symbols: :green,
           unread: :cyan,
-          debug: :red
+          debug: :red,
+          excerpt: :green
         },
         backup: {
-          auto_save_sent_posts: false,
-          auto_save_sent_messages: false,
-          auto_save_lists: false
+          posts: false,
+          messages: false,
+          lists: false
         },
         scroll: {
-          timer: 3
+          spinner: true,
+          timer: 3,
+          date: false
+        },
+        nicerank: {
+          threshold: 2.1,
+          filter: true,
+          unranked: false
         },
-        nicerank: @default_nr,
         nowplaying: {},
         movie: {
           hashtag: 'nowwatching'
         },
         tvshow: {
           hashtag: 'nowwatching'
+        },
+        blacklist: {
+          active: true
         }
       }
     end