ayadn 1.5.1 → 1.6.0

data/lib/ayadn/alias.rb

@@ -11,7 +11,7 @@ module Ayadn
         unless args.empty?
           channel, channel_alias = args[0], args[1]
         else
-          Action.quit Status.wrong_arguments
+          abort(Status.wrong_arguments)
         end
         if channel.is_integer?
           Databases.create_alias(channel, channel_alias)
@@ -38,7 +38,7 @@ module Ayadn
           Logs.rec.info "Deleted alias '#{args[0]}'."
           puts Status.done
         else
-          Action.quit Status.wrong_arguments
+          abort(Status.wrong_arguments)
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
@@ -55,7 +55,7 @@ module Ayadn
         unless database.nil?
           new_db = File.realpath(database)
         else
-          Action.quit Status.wrong_arguments
+          abort(Status.wrong_arguments)
         end
         if File.exist?(new_db)
           Databases.import_aliases(new_db)

data/lib/ayadn/api.rb

@@ -2,6 +2,10 @@
 module Ayadn
   class API
 
+    def initialize
+      @workers = Workers.new
+    end
+
     def get_unified(options)
       options = paginate options, 'unified'
       get_parsed_response(Endpoints.new.unified(options))
@@ -282,7 +286,7 @@ module Ayadn
       loop do
         resp = get_parsed_response(get_list_url(username, target, options))
         abort(Status.user_404(username)) if resp['meta']['code'] == 404
-        users = Workers.extract_users(resp)
+        users = @workers.extract_users(resp)
         big_hash.merge!(users)
         break if resp['meta']['min_id'] == nil
         options = {:count => 200, :before_id => resp['meta']['min_id']}

data/lib/ayadn/app.rb

@@ -3,7 +3,7 @@ module Ayadn
   class App < Thor
     package_name "Ayadn"
 
-    %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug}.each { |r| require_relative "#{r}" }
+    %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow}.each { |r| require_relative "#{r}" }
 
     ##
     # These methods are intended to be called from the CLI.
@@ -242,7 +242,7 @@ module Ayadn
     desc "delete POST", "Delete a post (-D)"
     map "-D" => :delete
     long_desc Descriptions.delete
-    def delete(post_id)
+    def delete(*post_id)
       Action.new.delete(post_id)
     end
 
@@ -419,7 +419,7 @@ module Ayadn
     long_desc Descriptions.blacklist
     subcommand "blacklist", Blacklist
 
-    desc "nowplaying", "Post the current iTunes track (-np)"
+    desc "nowplaying", "Post the current playing track from iTunes or Last.fm (-np)"
     map "-np" => :nowplaying
     long_desc Descriptions.nowplaying
     option :no_url, aliases: "-n", type: :boolean, desc: "Don't append preview or album art at the end of the post"
@@ -428,6 +428,25 @@ module Ayadn
       Action.new.nowplaying(options)
     end
 
+    desc "movie TITLE", "Create a post from a movie title (-NW)"
+    map "nowwatching" => :movie
+    map "imdb" => :movie
+    map "-NW" => :movie
+    long_desc Descriptions.nowwatching
+    option :alt, aliases: "-a", type: :boolean, desc: "Select an alternative response if the first didn't match"
+    def movie(*title)
+      Action.new.nowwatching(title, options)
+    end
+
+    desc "tvshow TITLE", "Create a post from a TV show title (-TV)"
+    map "-TV" => :tvshow
+    long_desc Descriptions.tvshow
+    option :alt, aliases: "-a", type: :boolean, desc: "Select an alternative response if the first didn't match"
+    option :banner, aliases: "-b", type: :boolean, desc: "Inserts the show banner instead of the show poster"
+    def tvshow(*title)
+      Action.new.tvshow(title, options)
+    end
+
     desc "random", "Show random posts from App.net (-rnd)"
     map "-rnd" => :random
     option :wait, aliases: "-w", type: :numeric, desc: "In seconds, time to wait before next page"

data/lib/ayadn/blacklist.rb

@@ -5,7 +5,7 @@ module Ayadn
     map "create" => :add
     long_desc Descriptions.blacklist_add
     def add(*args)
-      Action.quit(Status.type_and_target_missing) if args.length < 2
+      abort(Status.type_and_target_missing) if args.length < 2
       BlacklistWorkers.new.add(args)
       puts Status.done
     end
@@ -14,7 +14,7 @@ module Ayadn
     map "delete" => :remove
     long_desc Descriptions.blacklist_remove
     def remove(*args)
-      Action.quit(Status.type_and_target_missing) if args.length < 2
+      abort(Status.type_and_target_missing) if args.length < 2
       BlacklistWorkers.new.remove(args)
       puts Status.done
     end
@@ -54,6 +54,7 @@ module Ayadn
       Settings.init_config
       Logs.create_logger
       Databases.open_databases
+      @workers = Workers.new
     end
     def import(database)
       begin
@@ -95,11 +96,11 @@ module Ayadn
         type = args.shift
         case type
         when 'user', 'username', 'account'
-          target = Workers.add_arobases_to_usernames args
+          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.add_arobases_to_usernames args
+          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'
@@ -120,12 +121,12 @@ module Ayadn
         type = args.shift
         case type
         when 'user', 'username', 'account'
-          temp = Workers.add_arobases_to_usernames args
+          temp = @workers.add_arobases_to_usernames args
           target = temp.map {|u| "-#{u}"}
           Databases.remove_from_blacklist(target)
           Logs.rec.info "Removed '#{target}' from blacklist of users."
         when 'mention', 'mentions'
-          target = Workers.add_arobases_to_usernames args
+          target = @workers.add_arobases_to_usernames args
           Databases.remove_from_blacklist(target)
           Logs.rec.info "Removed '#{target}' from blacklist of mentions."
         when 'client', 'source', 'hashtag', 'tag'

data/lib/ayadn/check.rb

@@ -0,0 +1,187 @@
+# encoding: utf-8
+module Ayadn
+
+  class Check
+
+    def self.same_username(stream)
+      stream['data']['username'] == Settings.config[:identity][:username]
+    end
+
+    def self.auto_save_muted(list)
+      FileOps.save_muted_list(list) if Settings.options[:backup][:auto_save_lists]
+    end
+
+    def self.auto_save_followers(list)
+      FileOps.save_followers_list(list) if Settings.options[:backup][:auto_save_lists]
+    end
+
+    def self.auto_save_followings(list)
+      FileOps.save_followings_list(list) if Settings.options[:backup][:auto_save_lists]
+    end
+
+    def self.no_username username
+      abort(Status.error_missing_username) if username.empty?
+    end
+
+    def self.no_data stream, target
+      if stream['data'].empty?
+        Errors.warn "In action/#{target}: no data"
+        abort(Status.empty_list)
+      end
+    end
+
+    def self.no_new_posts stream, options, title
+      if options[:new]
+        unless Databases.has_new?(stream, title)
+          abort(Status.no_new_posts)
+        end
+      end
+    end
+
+    def self.no_post stream, post_id
+      if stream['meta']['code'] == 404
+        puts Status.post_404(post_id)
+        Errors.info("Impossible to find #{post_id}")
+        exit
+      end
+    end
+
+    def self.bad_post_id post_id
+      abort(Status.error_missing_post_id) unless post_id.is_integer?
+    end
+
+    def self.no_user stream, username
+      if stream['meta']['code'] == 404
+        puts Status.user_404(username)
+        Errors.info("User #{username} doesn't exist")
+        exit
+      end
+    end
+
+    def self.has_been_unfollowed(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.unfollowed(username)
+        Logs.rec.info "Unfollowed #{username}."
+      else
+        Errors.whine(Status.not_unfollowed(username), resp)
+      end
+    end
+
+    def self.has_been_unmuted(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.unmuted(username)
+        Logs.rec.info "Unmuted #{username}."
+      else
+        Errors.whine(Status.not_unmuted(username), resp)
+      end
+    end
+
+    def self.already_starred(resp)
+      if resp['data']['you_starred']
+        puts "\nYou already starred this post.\n".color(:red)
+        exit
+      end
+    end
+
+    def self.already_reposted(resp)
+      if resp['data']['you_reposted']
+        puts "\nYou already reposted this post.\n".color(:red)
+        exit
+      end
+    end
+
+    def self.has_been_starred(post_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.starred(post_id)
+        Logs.rec.info "Starred #{post_id}."
+      else
+        Errors.whine(Status.not_starred(post_id), resp)
+      end
+    end
+
+    def self.has_been_reposted(post_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.reposted(post_id)
+        Logs.rec.info "Reposted #{post_id}."
+      else
+        Errors.whine(Status.not_reposted(post_id), resp)
+      end
+    end
+
+    def self.has_been_blocked(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.blocked(username)
+        Logs.rec.info "Blocked #{username}."
+      else
+        Errors.whine(Status.not_blocked(username), resp)
+      end
+    end
+
+    def self.has_been_muted(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.muted(username)
+        Logs.rec.info "Muted #{username}."
+      else
+        Errors.whine(Status.not_muted(username), resp)
+      end
+    end
+
+    def self.has_been_followed(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.followed(username)
+        Logs.rec.info "Followed #{username}."
+      else
+        Errors.whine(Status.not_followed(username), resp)
+      end
+    end
+
+    def self.has_been_deleted(post_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.deleted(post_id)
+        Logs.rec.info "Deleted post #{post_id}."
+      else
+        Errors.whine(Status.not_deleted(post_id), resp)
+      end
+    end
+
+    def self.message_has_been_deleted(message_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.deleted_m(message_id)
+        Logs.rec.info "Deleted message #{message_id}."
+      else
+        Errors.whine(Status.not_deleted(message_id), resp)
+      end
+    end
+
+    def self.has_been_unblocked(username, resp)
+      if resp['meta']['code'] == 200
+        puts Status.unblocked(username)
+        Logs.rec.info "Unblocked #{username}."
+      else
+        Errors.whine(Status.not_unblocked(username), resp)
+      end
+    end
+
+    def self.has_been_unstarred(post_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.unstarred(post_id)
+        Logs.rec.info "Unstarred #{post_id}."
+      else
+        Errors.whine(Status.not_unstarred(post_id), resp)
+      end
+    end
+
+    def self.has_been_unreposted(post_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.unreposted(post_id)
+        Logs.rec.info "Unreposted #{post_id}."
+      else
+        Errors.whine(Status.not_unreposted(post_id), resp)
+      end
+    end
+
+
+
+  end
+
+end

data/lib/ayadn/descriptions.rb

@@ -1128,6 +1128,92 @@ module Ayadn
       \n\n
       USAGE
     end
+    def self.nowwatching
+      <<-USAGE
+      Create a post from (part of) a movie title. Includes movie poster and IMDb url.
+
+      Usage:
+
+      ayadn movie ghost in the shell
+
+      ayadn movie existenz
+
+      ayadn -NW beetlejuice
+
+      (shortcut is 'NW' because of 'nowwatching')
+
+      If the movie is not the one you're looking for, you can specify the 'alt' option to force find an alternative.
+
+      This is useful for remakes:
+
+      ayadn -NW solaris
+
+      (gives the 2002 version)
+
+      ayadn -NW solaris --alt
+
+      (gives the 1972 version)
+
+      Aliases:
+
+      ayadn nowwatching godfather II
+
+      ayadn imdb -a conan
+
+      Hashtag:
+
+      You can modify the hashtag with 'set':
+
+      ayadn set movie hashtag movietime
+
+      ayadn set movie hashtag adnmovieclub
+
+      (default is 'nowwatching')
+      \n\n
+      USAGE
+    end
+    def self.tvshow
+      <<-USAGE
+      Create a post from (part of) a TV show title. Includes show poster and IMDb url.
+
+      Usage:
+
+      ayadn tvshow magnum
+
+      ayadn tvshow game of thrones
+
+      ayadn -TV 24
+
+      If the show is not the one you're looking for, you can specify the 'alt' option to force find an alternative.
+
+      ayadn -TV whose line
+
+      (gives the US version)
+
+      ayadn -TV whose line --alt
+
+      (gives the UK version)
+
+      Hashtag:
+
+      You can modify the hashtag with 'set':
+
+      ayadn set tvshow hashtag showtime
+
+      ayadn set tvshow hashtag tvshow
+
+      (default is 'nowwatching')
+
+      Banner:
+
+      Use the `--banner` (-b) options to insert a banner instead of a poster:
+
+      ayadn -TV magnum --banner
+
+      ayadn -TV -b magnum
+      \n\n
+      USAGE
+    end
     def self.random_posts
       <<-USAGE
       Show random posts from App.net.

data/lib/ayadn/errors.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Ayadn
   class Errors
+
     def self.global_error(args)
       Logs.rec.error "--BEGIN--"
       Logs.rec.error "CAUSE: #{args[:error]}"
@@ -18,20 +19,36 @@ module Ayadn
       Debug.err(args[:error], stack)
       exit
     end
+
     def self.error(status)
       Logs.rec.error status
     end
+
     def self.warn(warning)
       Logs.rec.warn warning
     end
+
     def self.info(msg)
       Logs.rec.info msg
     end
+
     def self.repost(repost, original)
       Logs.rec.info "Post #{repost} is a repost. Using original: #{original}."
     end
+
     def self.nr msg
       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)
+    end
+
   end
 end