ayadn 3.0 → 4.0

data/lib/ayadn/search.rb

@@ -7,37 +7,43 @@ module Ayadn
       @api = api
       @view = view
       @workers = workers
-      @check = Check.new
     end
 
     def hashtag(hashtag, options)
-      Settings.global[:force] = true if options[:force]
+      Settings.options.timeline.compact = true if options[:compact]
+      Settings.global.force = true if options[:force]
       @view.downloading(options)
       stream = @api.get_hashtag(hashtag)
-      @check.no_data(stream, 'hashtag')
+      stream_object = StreamObject.new(stream)
+      Check.new.no_data(stream_object, 'hashtag')
       if options[:extract]
-        @view.all_hashtag_links(stream, hashtag)
+        @view.all_hashtag_links(stream_object, hashtag)
       else
-        @view.render(stream, options)
-        if Settings.options[:timeline][:compact] == true && !options[:raw]
+        @view.render(stream_object, options)
+        if Settings.options.timeline.compact && !options[:raw]
           puts "\n" 
         end
       end
     end
 
     def find(words, options)
-      Settings.global[:force] = true if options[:force]
+      Settings.options.timeline.compact = true if options[:compact]
+      Settings.global.force = true if options[:force]
       @view.downloading(options)
       stream = get_stream(words, options)
-      @check.no_data(stream, 'search')
       if options[:users]
-        get_users(stream, options)
+        stream_object = stream["data"].map { |user| UserObject.new(user) }
+      elsif !options[:channels]
+        stream_object = StreamObject.new(stream)
+      end
+      if options[:users]
+        get_users(stream_object, options)
       elsif options[:channels]
         get_channels(stream, options)
       else
-        get_generic(stream, words, options)
+        get_generic(stream_object, words, options)
       end
-      if Settings.options[:timeline][:compact] == true && !options[:raw]
+      if Settings.options.timeline.compact && !options[:raw]
         puts "\n" 
       end
     end
@@ -70,16 +76,17 @@ module Ayadn
     end
 
     def get_channels stream, options
-      @view.show_channels(stream, options)
+      stream_object = stream["data"].map { |ch| ChannelObject.new(ch) }
+      @view.show_channels(stream_object, options)
     end
 
     def get_users stream, options
-      sorted = stream['data'].sort_by {|obj| obj['counts']['followers']}
+      sorted = stream.sort_by {|obj| obj.counts.followers}
       sorted.each do |obj|
-        puts @view.big_separator unless Settings.options[:timeline][:compact] == true
+        puts @view.big_separator unless Settings.options.timeline.compact
         @view.show_userinfos(obj, nil, false)
       end
-      puts "\n" if Settings.options[:timeline][:compact] == true
+      puts "\n" if Settings.options.timeline.compact
     end
 
   end

data/lib/ayadn/set.rb

@@ -14,32 +14,6 @@ module Ayadn
       scroll_config.save
     end
 
-    desc "movie ITEM VALUE", "Set values for movie (nowwatching)"
-    map "nowwatching" => :movie
-    def movie(*args)
-      movie_config = SetMovie.new
-      unless args.length != 2
-        movie_config.send(args[0], args[1])
-      else
-        Status.new.error_missing_parameters
-        exit
-      end
-      movie_config.save
-    end
-
-    desc "tvshow ITEM VALUE", "Set values for tvshow (nowwatching)"
-    map "tv" => :tvshow
-    def tvshow(*args)
-      tvshow_config = SetTVShow.new
-      unless args.length != 2
-        tvshow_config.send(args[0], args[1])
-      else
-        Status.new.error_missing_parameters
-        exit
-      end
-      tvshow_config.save
-    end
-
     desc "marker ITEM TRUE/FALSE", "Set values for stream markers"
     map "markers" => :marker
     def marker(*args)
@@ -135,7 +109,7 @@ module Ayadn
     desc "edit", "Edit settings in $EDITOR"
     def edit
       Settings.load_config()
-      sets = Settings.config[:paths][:config] + "/config.yml"
+      sets = Settings.config.paths.config + "/config.yml"
       if sets.blank?
         Status.new.not_authorized
         exit
@@ -378,12 +352,12 @@ module Ayadn
         value = args[0].to_i
         @input = 'table width'
         @output = Validators.width_range(value)
-        Settings.options[:formats][:table][:width] = @output
+        Settings.options.formats.table.width = @output
       elsif type == 'borders' || type == 'border'
         value = args[0]
         @input = 'table borders'
         @output = Validators.boolean(value)
-        Settings.options[:formats][:table][:borders] = @output
+        Settings.options.formats.table.borders = @output
       else
         @status.error_missing_parameters
         exit
@@ -400,7 +374,7 @@ module Ayadn
       if type == 'reverse' || type == 'reversed'
         @input = 'list reverse'
         @output = Validators.boolean(value)
-        Settings.options[:formats][:list][:reverse] = @output
+        Settings.options.formats.list.reverse = @output
       else
         @status.error_missing_parameters
         exit
@@ -427,49 +401,19 @@ module Ayadn
     def timer(t)
       @input = 'timer'
       @output = validate(t)
-      Settings.options[:scroll][:timer] = @output
+      Settings.options.scroll.timer = @output
     end
 
     def date(value)
       @input = 'date'
       @output = Validators.boolean(value)
-      Settings.options[:scroll][:date] = @output
+      Settings.options.scroll.date = @output
     end
 
     def spinner(value)
       @input = 'spinner'
       @output = Validators.boolean(value)
-      Settings.options[:scroll][:spinner] = @output
-    end
-
-  end
-
-  class SetMovie < SetBase
-
-    def initialize
-      super
-      @category = 'movie'
-    end
-
-    def hashtag(tag)
-      @input = 'hashtag'
-      @output = tag
-      Settings.options[:movie][:hashtag] = @output
-    end
-
-  end
-
-  class SetTVShow < SetBase
-
-    def initialize
-      super
-      @category = 'tvshow'
-    end
-
-    def hashtag(tag)
-      @input = 'hashtag'
-      @output = tag
-      Settings.options[:tvshow][:hashtag] = @output
+      Settings.options.scroll.spinner = @output
     end
 
   end
@@ -484,7 +428,7 @@ module Ayadn
     def filter value
       @input = 'filter'
       @output = Validators.boolean(value)
-      Settings.options[:nicerank][:filter] = @output
+      Settings.options.nicerank.filter = @output
     end
 
     def active value
@@ -494,13 +438,13 @@ module Ayadn
     def unranked value
       @input = 'unranked'
       @output = Validators.boolean(value)
-      Settings.options[:nicerank][:unranked] = @output
+      Settings.options.nicerank.unranked = @output
     end
 
     def threshold value
       @input = 'threshold'
       @output = Validators.threshold(value)
-      Settings.options[:nicerank][:threshold] = @output
+      Settings.options.nicerank.threshold = @output
     end
 
   end
@@ -520,8 +464,12 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'posts', 'messages', 'lists'
-        Settings.options[:backup][meth.to_sym] = @output
+      when 'posts'
+        Settings.options.backup.posts = @output
+      when 'messages'
+        Settings.options.backup.messages = @output
+      when 'lists'
+        Settings.options.backup.lists = @output
       else
         super
       end
@@ -545,7 +493,7 @@ module Ayadn
       @output = validate(options)
       case @input
       when 'messages'
-        Settings.options[:marker][meth.to_sym] = @output
+        Settings.options.marker.messages = @output
       else
         super
       end
@@ -569,7 +517,7 @@ module Ayadn
       @output = validate(options)
       case @input
       when 'links'
-        Settings.options[:channels][meth.to_sym] = @output
+        Settings.options.channels.links = @output
       else
         super
       end
@@ -593,7 +541,7 @@ module Ayadn
       @output = validate(options)
       case @input
       when 'active', 'activated'
-        Settings.options[:blacklist][meth.to_sym] = @output
+        Settings.options.blacklist.active = @output
       else
         super
       end
@@ -616,8 +564,38 @@ module Ayadn
       @input = meth.to_s.capitalize
       @output = validate(options.to_i)
       case meth.to_s
-      when 'default', 'unified', 'checkins', 'conversations', 'global', 'photos', 'trending', 'mentions', 'convo', 'posts', 'messages', 'search', 'whoreposted', 'whostarred', 'whatstarred', 'files'
-        Settings.options[:counts][meth.to_sym] = @output
+      when 'default'
+        Settings.options.counts.default = @output
+      when 'unified'
+        Settings.options.counts.unified = @output
+      when 'checkins'
+        Settings.options.counts.checkins = @output
+      when 'conversations'
+        Settings.options.counts.conversations = @output
+      when 'global'
+        Settings.options.counts.global = @output
+      when 'photos'
+        Settings.options.counts.photos = @output
+      when 'trending'
+        Settings.options.counts.trending = @output
+      when 'mentions'
+        Settings.options.counts.mentions = @output
+      when 'convo'
+        Settings.options.counts.convo = @output
+      when 'posts'
+        Settings.options.counts.posts = @output
+      when 'messages'
+        Settings.options.counts.messages = @output
+      when 'search'
+        Settings.options.counts.search = @output
+      when 'whoreposted'
+        Settings.options.counts.whoreposted = @output
+      when 'whostarred'
+        Settings.options.counts.whostarred = @output
+      when 'whatstarred'
+        Settings.options.counts.whatstarred = @output
+      when 'files'
+        Settings.options.counts.files = @output
       else
         super
       end
@@ -640,10 +618,20 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'directed', 'source', 'symbols', 'name', 'date', 'debug', 'compact'
-        Settings.options[:timeline][meth.to_sym] = @output
-      else
-        super
+      when 'directed'
+        Settings.options.timeline.directed = @output
+      when 'source'
+        Settings.options.timeline.source = @output
+      when 'symbols'
+        Settings.options.timeline.symbols = @output
+      when 'name'
+        Settings.options.timeline.name = @output
+      when 'date'
+        Settings.options.timeline.date = @output
+      when 'debug'
+        Settings.options.timeline.debug = @output
+      when 'compact'
+        Settings.options.timeline.compact = @output
       end
     end
 
@@ -664,12 +652,34 @@ module Ayadn
       @input = meth.to_s.capitalize
       @output = validate(options)
       case meth.to_s
-      when 'id', 'index', 'username', 'name', 'date', 'link', 'dots', 'hashtags', 'mentions', 'source', 'symbols', 'unread', 'debug', 'excerpt'
-        Settings.options[:colors][meth.to_sym] = @output
-      when 'hashtag', 'mention', 'symbol'
-        Settings.options[:colors]["#{meth}s".to_sym] = @output
-      when 'client'
-        Settings.options[:colors][:source] = @output
+      when 'id'
+        Settings.options.colors.id = @output
+      when 'index'
+        Settings.options.colors.index = @output
+      when 'username'
+        Settings.options.colors.username = @output
+      when 'name'
+        Settings.options.colors.name = @output
+      when 'date'
+        Settings.options.colors.date = @output
+      when 'link'
+        Settings.options.colors.link = @output
+      when 'dots'
+        Settings.options.colors.dots = @output
+      when 'mentions', 'mention'
+        Settings.options.colors.mentions = @output
+      when 'symbols', 'symbol'
+        Settings.options.colors.symbols = @output
+      when 'unread'
+        Settings.options.colors.unread = @output
+      when 'debug'
+        Settings.options.colors.debug = @output
+      when 'excerpt'
+        Settings.options.colors.excerpt = @output
+      when 'hashtag', 'tag', 'hashtags'
+        Settings.options.colors.hashtag = @output
+      when 'client', 'source'
+        Settings.options.colors.source = @output
       else
         super
       end

data/lib/ayadn/settings.rb

@@ -2,11 +2,9 @@
 module Ayadn
   class Settings
 
-    # Warning
-    # comment next line
     require_relative "ids"
-    # uncomment and insert your own client id
-    # CLIENT_ID = ""
+ 
+    require 'ostruct'
 
     class << self
       attr_accessor :options, :config, :global
@@ -26,7 +24,7 @@ module Ayadn
       else
         "https://api.app.net"
       end
-      @config = {
+      config_hash = {
         paths: {
           home: home,
           log: "#{home}/log",
@@ -47,8 +45,11 @@ module Ayadn
           baseURL: baseURL
         }
       }
-      @options = self.defaults
-      @global = {scrolling: false, force: false}
+      @config = JSON.parse(config_hash.to_json, object_class: OpenStruct)
+      global_hash = {scrolling: false, force: false}
+      @global = JSON.parse(global_hash.to_json, object_class: OpenStruct)
+
+      @options = Preferences.new(self.defaults)
     end
 
     def self.check_for_accounts
@@ -84,41 +85,38 @@ module Ayadn
     end
 
     def self.init_config
-      @config[:version] = VERSION
-      @config[:platform] = RbConfig::CONFIG['host_os']
-      @config[:ruby] = RUBY_VERSION
-      @config[:locale] = ENV["LANG"]
+      @config.version = VERSION
+      @config.platform = RbConfig::CONFIG['host_os']
+      @config.ruby = RUBY_VERSION
+      @config.locale = ENV["LANG"]
       self.config_file
       self.create_api_file
       self.create_version_file
     end
 
     def self.save_config
-      File.write(@config[:paths][:config] + "/config.yml", @options.to_yaml)
+      File.write(@config.paths.config + "/config.yml", @options.to_h.to_yaml)
     end
 
     def self.has_token_file?
-      File.exist?(@config[:paths][:auth] + "/token")
+      File.exist?(@config.paths.auth + "/token")
     end
 
     def self.read_token_file
-      File.read(@config[:paths][:auth] + "/token")
+      File.read(@config.paths.auth + "/token")
     end
 
     def self.config_file
-      config_file = @config[:paths][:config] + "/config.yml"
+      config_file = @config.paths.config + "/config.yml"
       if File.exist?(config_file)
         begin
-          # conf = YAML.load(File.read(config_file))
-          # @options = conf
-          @options = YAML.load(File.read(config_file))
-          # self.write_config_file(config_file, @options)
+          @options = Preferences.new(YAML.load(File.read(config_file)))
         rescue => e
           Errors.global_error({error: e, caller: caller, data: []})
         end
       else
         begin
-          self.write_config_file(config_file, @options)
+          self.write_config_file(config_file, @options.to_h)
         rescue => e
           Errors.global_error({error: e, caller: caller, data: []})
         end
@@ -126,7 +124,7 @@ module Ayadn
     end
 
     def self.create_api_file
-      api_file = @config[:paths][:config] + "/api.json"
+      api_file = @config.paths.config + "/api.json"
       if File.exist?(api_file)
         # should be 48h in secs (172800)
         # but since ADN's API won't change any time soon...
@@ -140,12 +138,12 @@ module Ayadn
     end
 
     def self.create_version_file
-      File.write(@config[:paths][:config] + "/version.yml", {version: @config[:version]}.to_yaml)
+      File.write(@config.paths.config + "/version.yml", {version: @config.version}.to_yaml)
     end
 
     def self.restore_defaults
       self.load_config
-      File.write(@config[:paths][:config] + "/config.yml", @options.to_yaml)
+      File.write(@config.paths.config + "/config.yml", @options.to_h.to_yaml)
     end
 
     private
@@ -159,16 +157,16 @@ module Ayadn
 
     def self.read_api(api_file)
       content = JSON.parse(File.read(api_file))
-      @config[:post_max_length] = content['post']['text_max_length']
-      @config[:message_max_length] = content['message']['text_max_length']
+      @config.post_max_length = content['post']['text_max_length']
+      @config.message_max_length = content['message']['text_max_length']
     end
 
     def self.has_version_file?
-      File.exist?(@config[:paths][:config] + "/version.yml")
+      File.exist?(@config.paths.config + "/version.yml")
     end
 
     def self.read_version_file
-      YAML.load(File.read(@config[:paths][:config] + "/version.yml"))
+      YAML.load(File.read(@config.paths.config + "/version.yml"))
     end
 
     def self.write_config_file(config_file, options)
@@ -251,12 +249,6 @@ module Ayadn
           unranked: false
         },
         nowplaying: {},
-        movie: {
-          hashtag: 'nowwatching'
-        },
-        tvshow: {
-          hashtag: 'nowwatching'
-        },
         blacklist: {
           active: true
         }