ayadn 1.8.2 → 2.0

data/lib/ayadn/nowplaying.rb

@@ -5,39 +5,72 @@ module Ayadn
 
     require 'rss'
 
-    def initialize api, view, workers
+    def initialize api, view, workers, options = {}
       @api = api
       @view = view
       @workers = workers
+      @status = Status.new
+      unless options[:hashtag]
+        @hashtag = "#nowplaying"
+      else
+        @hashtag = "##{options[:hashtag].join()}"
+      end
+      unless options[:text]
+        @custom_text = nil
+      else
+        @custom_text = "\n \n#{options[:text].join(' ')}"
+      end
     end
 
     def lastfm options
       begin
         user = Settings.options[:nowplaying][:lastfm] || create_lastfm_user()
-        puts Status.fetching_from('Last.fm')
+        @status.fetching_from('Last.fm')
         artist, track = get_lastfm_track_infos(user)
-        puts Status.itunes_store
-        store = lastfm_istore_request(artist, track) unless options['no_url']
-        text_to_post = "#nowplaying\n \nTitle: ‘#{track}’\nArtist: #{artist}"
+        @status.itunes_store
+        store = []
+        unless options['no_url']
+          store = lastfm_istore_request(artist, track)
+          if store['code'] == 404 && artist =~ /(and)/
+            artist.gsub!('and', '&')
+            store = lastfm_istore_request(artist, track)
+          end
+        end
+        text_to_post = "#{@hashtag}\n \nTitle: ‘#{track}’\nArtist: #{artist}#{@custom_text}"
         post_nowplaying(text_to_post, store, options)
       rescue => e
-        puts Status.wtf
+        @status.wtf
         Errors.global_error({error: e, caller: caller, data: [store, options]})
       end
     end
 
     def itunes options
       begin
-        abort(Status.error_only_osx) unless Settings.config[:platform] =~ /darwin/
-        puts Status.fetching_from('iTunes')
+        unless Settings.config[:platform] =~ /darwin/
+          @status.error_only_osx
+          exit
+        end
+        @status.fetching_from('iTunes')
         itunes = get_itunes_track_infos()
-        itunes.each {|el| abort(Status.empty_fields) if el.length == 0}
-        puts Status.itunes_store
-        store = itunes_istore_request(itunes) unless options['no_url']
-        text_to_post = "#nowplaying\n \nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
+        itunes.each do |el|
+          if el.length == 0
+            @status.empty_fields
+            exit
+          end
+        end
+        @status.itunes_store
+        store = []
+        unless options['no_url']
+          store = itunes_istore_request(itunes)
+          if store['code'] == 404 && itunes.artist =~ /(and)/
+            itunes.artist.gsub!('and', '&')
+            store = itunes_istore_request(itunes)
+          end
+        end
+        text_to_post = "#{@hashtag}\n \nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’#{@custom_text}"
         post_nowplaying(text_to_post, store, options)
       rescue => e
-        puts Status.wtf
+        @status.wtf
         Errors.global_error({error: e, caller: caller, data: [itunes, store, options]})
       end
     end
@@ -51,24 +84,39 @@ module Ayadn
         lfm = feed.items[0].title.split(' – ')
         return lfm[0], lfm[1]
       rescue Interrupt
-        abort(Status.canceled)
+        @status.canceled
+        exit
       end
     end
 
     def post_nowplaying text_to_post, store, options
       begin
-        @view.clear_screen
-        puts Status.writing
-        show_nowplaying("\n#{text_to_post}", options, store)
+        before = text_to_post
         unless options[:no_url] || store.nil?
           text_to_post += "\n \n[iTunes Store](#{store['link']})"
         end
-        abort(Status.canceled) unless STDIN.getch == ("y" || "Y")
-        puts "\n#{Status.yourpost}"
+        poster = Post.new
+        poster.post_size_error(text_to_post) if poster.post_size_ok?(text_to_post) == false
+        @view.clear_screen
+        @status.writing
+        show_nowplaying("\n#{before}", options, store)
+        unless STDIN.getch == ("y" || "Y")
+          @status.canceled
+          exit
+        end
+        @view.clear_screen
+        @status.yourpost
+        puts "\n\n"
         if store.nil? || options[:no_url]
+          text_to_post = before
           visible, track, artwork, artwork_thumb, link, artist = false
         else
-          visible, track, artwork, artwork_thumb, link, artist = true, store['track'], store['artwork'], store['artwork_thumb'], store['link'], store['artist']
+          if store['link'].nil? || store['code'] == 404
+            text_to_post = before
+            visible, track, artwork, artwork_thumb, link, artist = false
+          else
+            visible, track, artwork, artwork_thumb, link, artist = true, store['track'], store['artwork'], store['artwork_thumb'], store['link'], store['artist']
+          end
         end
         options = options.dup
         options[:nowplaying] = true
@@ -92,21 +140,23 @@ module Ayadn
           source: source,
           visible: visible
         }
-        resp = Post.new.post(dic)
-        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+        resp = poster.post(dic)
+        FileOps.save_post(resp) if Settings.options[:backup][:posts]
         @view.show_posted(resp)
       rescue => e
-        puts Status.wtf
+        @status.wtf
         Errors.global_error({error: e, caller: caller, data: [dic, store, options]})
       end
     end
 
     def ask_lastfm_user
-      puts "\nPlease enter your Last.fm username:\n".color(:cyan)
+      @status.info("please", "enter your Last.fm username", "yellow")
+      print "> "
       begin
         STDIN.gets.chomp!
       rescue Interrupt
-        abort(Status.canceled)
+        @status.canceled
+        exit
       end
     end
 
@@ -117,49 +167,60 @@ module Ayadn
     end
 
     def itunes_istore_request itunes
-      infos = itunes_reg([itunes.artist, itunes.track, itunes.album])
-      itunes_url = "https://itunes.apple.com/search?term=#{infos[0]}&term=#{infos[1]}&term=#{infos[2]}&media=music&entity=musicTrack"
+      itunes_url = "https://itunes.apple.com/search?term=#{itunes.artist}&term=#{itunes.track}&term=#{itunes.album}&media=music&entity=musicTrack"
       get_itunes_store(itunes_url, itunes.artist, itunes.track)
     end
 
     def lastfm_istore_request artist, track
-      infos = itunes_reg([artist, track])
-      itunes_url = "https://itunes.apple.com/search?term=#{infos[0]}&term=#{infos[1]}&media=music&entity=musicTrack"
+      itunes_url = "https://itunes.apple.com/search?term=#{artist}&term=#{track}&media=music&entity=musicTrack"
       get_itunes_store(itunes_url, artist, track)
     end
 
     def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
-
+      # puts results.inspect
       unless results.empty? || results.nil?
-
-        results.keep_if do |obj|
-          unless obj['artistName'].nil?
+        # results.each {|obj| puts obj['trackName']}
+        # puts "-"
+        # puts track
+        one = results.select do |obj|
+          next if obj['trackName'].nil?
+          obj['trackName'].downcase == track.downcase
+        end
+        # puts one.inspect
+        if one.empty?
+          by_artist = results.select do |obj|
+            next if obj['artistName'].nil?
             obj['artistName'].downcase == artist.downcase
           end
-        end
-
-        if results.empty?
-          return {
-            'code' => 404,
-            'request' => url
-          }
-        end
+          # puts by_artist
+          by_exact_track = by_artist.select do |obj|
+            next if obj['trackName'].nil?
+            obj['trackName'].downcase == track.downcase
+          end
+          # puts by_exact_track
+          if by_exact_track.empty?
+            splitted = track.split(" ").first.downcase
+            results = by_artist.select do |obj|
+              next if obj['trackName'].nil?
+              obj['trackName'].split(" ").first.downcase == splitted
+            end
+          else
+            results = by_exact_track
+          end
 
-        if results.length > 1
-          resp = results.select {|obj| obj['trackName'].downcase == track.downcase}
         else
-          resp = results
+          results = one
         end
 
-        if resp.empty?
+        if results.empty?
           return {
             'code' => 404,
             'request' => url
           }
         end
 
-        candidate = resp[0] || results[0]
+        candidate = results[0]
 
         return {
           'code' => 200,
@@ -180,17 +241,10 @@ module Ayadn
       end
     end
 
-    def itunes_reg arr_of_itunes
-      regex_exotics = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
-      arr_of_itunes.map do |itune|
-        itune.gsub(regex_exotics, ' ').split(' ').join('+')
-      end
-    end
-
     def get_itunes_track_infos
       track = `osascript -e 'tell application "iTunes"' -e 'set trackName to name of current track' -e 'return trackName' -e 'end tell'`
       if track.empty?
-        puts Status.no_itunes
+        @status.no_itunes
         Errors.warn "Nowplaying canceled: unable to get info from iTunes."
         exit
       end
@@ -201,13 +255,22 @@ module Ayadn
     end
 
     def show_nowplaying(text, options, store)
-      puts "\nYour post:\n".color(:cyan)
-      if options['no_url'] || store['code'] != 200
-        puts text + "\n\n\n"
-      else
-        puts text + "\n\n\nThe iTunes Store thinks this track is: ".color(:green) + "'#{store['track']}'".color(:magenta) + " by ".color(:green) + "'#{store['artist']}'".color(:magenta) + ".\n\nAyadn will use these elements to insert album artwork and a link to the track.\n\n".color(:green)
+      # @status.to_be_posted
+      thor = Thor::Shell::Basic.new
+      text.split("\n").each do |line|
+        thor.say_status(nil, line.color(Settings.options[:colors][:excerpt]))
+      end
+      puts "\n"
+      unless options['no_url'] || store['code'] != 200
+        thor.say_status(nil, "[iTunes link](#1)")
+        thor.say_status(nil, "[album art](#2)")
+        puts "\n\n"
+        thor.say_status(:'#1', store['link'])
+        thor.say_status(:'#2', store['artwork'])
+        puts "\n"
+        @status.itunes_store_track(store)
       end
-      puts "Is it ok? (y/N) ".color(:yellow)
+      @status.ok?
     end
 
   end

data/lib/ayadn/nowwatching.rb

@@ -3,11 +3,18 @@ module Ayadn
 
   class NowWatching
 
-    require 'spotlite'
+    begin
+      require 'spotlite'
+    rescue LoadError => e
+      puts "\nAYADN: Error while loading Gems\n\n"
+      puts "RUBY: #{e}\n\n"
+      exit
+    end
 
     def initialize view = nil
       @view = view
       @spotlite = Spotlite::Movie
+      @status = Status.new
     end
 
     # -----
@@ -36,14 +43,14 @@ module Ayadn
 
     def post args, options
       options = options.dup
-      puts "\nContacting IMDb.com...".color(:cyan)
+      @status.info("connected", "IMDb", "yellow")
       response = find_by_title(args, options)
       text = format_post(response)
       show_post(text)
       filename = create_filename(response)
       FileOps.download_url(filename, response.poster_url)
       @view.clear_screen
-      puts "\nPosting and uploading the movie poster...\n".color(:green)
+      @status.info("uploading", "movie poster", "yellow")
       options[:embed] = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
       options[:movie] = true
       dic = {
@@ -53,9 +60,10 @@ module Ayadn
         source: 'IMDb'
       }
       resp = Post.new.post(dic)
-      FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+      FileOps.save_post(resp) if Settings.options[:backup][:posts]
       @view.clear_screen
-      puts Status.yourpost
+      @status.yourpost
+      puts "\n\n"
       @view.show_posted(resp)
     end
 
@@ -91,11 +99,19 @@ module Ayadn
 
     def show_post text
       @view.clear_screen
-      puts Status.writing
-      puts "\nYour post:\n\n".color(:cyan)
-      puts text
-      puts "\nIs it ok? (y/N)".color(:yellow)
-      abort(Status.canceled) unless STDIN.getch == ("y" || "Y")
+      @status.writing
+      @status.to_be_posted
+      thor = Thor::Shell::Basic.new
+      puts "\n"
+      text.split("\n").each do |line|
+        thor.say_status(nil, line.color(Settings.options[:colors][:excerpt]))
+      end
+      puts "\n"
+      @status.ok?
+      unless STDIN.getch == ("y" || "Y")
+        @status.canceled
+        exit
+      end
     end
 
   end

data/lib/ayadn/pinboard.rb

@@ -2,27 +2,32 @@
 module Ayadn
   class PinBoard
 
+    def initialize
+      @status = Status.new
+    end
+
     def has_credentials_file?
-      File.exist?(Ayadn::Settings.config[:paths][:db] + '/ayadn_pinboard.db')
+      File.exist?(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data')
     end
 
     def ask_credentials
       begin
-        puts Status.pin_username
+        @status.pin_username
         pin_username = STDIN.gets.chomp()
-        puts Status.pin_password
+        @status.pin_password
         pin_password = STDIN.noecho(&:gets).chomp()
       rescue Interrupt
-        abort(Status.canceled)
+        @status.canceled
+        exit
       rescue => e
-        puts Status.wtf
+        @status.wtf
         Errors.global_error({error: e, caller: caller, data: [pin_username]})
       end
       save_credentials(encode(pin_username, pin_password))
     end
 
     def load_credentials
-      decode(File.read(Ayadn::Settings.config[:paths][:db] + '/ayadn_pinboard.db'))
+      decode(File.read(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data'))
     end
 
     def pin(data)
@@ -37,7 +42,7 @@ module Ayadn
     end
 
     def save_credentials(encoded_pinboard_credentials)
-      File.write(Ayadn::Settings.config[:paths][:db] + '/ayadn_pinboard.db', encoded_pinboard_credentials)
+      File.write(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data', encoded_pinboard_credentials)
     end
 
     def encode(username, password)

data/lib/ayadn/post.rb

@@ -2,6 +2,10 @@
 module Ayadn
   class Post
 
+    def initialize
+      @status = Status.new
+    end
+
     def post(dic)
       send_content(Endpoints.new.posts_url, payload_basic(dic))
     end
@@ -16,7 +20,7 @@ module Ayadn
         next if m == Settings.config[:identity][:username]
         reply << " @#{m}"
       end
-      post_size(reply)
+      post_size_error(reply) if post_size_ok?(reply) == false
       dic[:text] = reply
       dic[:reply_to] = dic[:id]
       send_content(Endpoints.new.posts_url, payload_reply(dic))
@@ -84,65 +88,67 @@ module Ayadn
           #while buffer = Readline.readline("#{Settings.config[:identity][:handle]} >> ".color(:red))
           while buffer = Readline.readline(">> ".color(:red))
             resp = post({text: buffer})
-            FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
-            puts Status.done
+            FileOps.save_post(resp) if Settings.options[:backup][:posts]
+            @status.done
           end
         rescue Interrupt
-          abort(Status.canceled)
+          @status.canceled
+          exit
         end
       end
     end
 
     def readline
-      puts Status.readline
+      @status.readline
       post = []
       begin
         while buffer = Readline.readline("> ")
           post << buffer
         end
       rescue Interrupt
-        abort(Status.canceled)
+        @status.canceled
+        exit
       end
       post
     end
 
-    def post_size(post) # works on a string
-      words = post.split(" ")
-      result = []
-      words.each { |word| result << get_markdown_text(word) }
-      post = result.join(" ")
-      size, max_size = post.length, Settings.config[:post_max_length]
-      if size < 1
-        abort(error_text_empty)
-      elsif size > max_size
-        Errors.warn "Canceled: too long (#{size - max_size}chars)"
-        puts "\nYour text was: \n\n#{post}\n\n".color(:yellow)
-        abort(Status.too_long(size, max_size))
-      end
+    def post_size_ok?(post) # works on a string, returns boolean
+      text = keep_text_from_markdown_links(post)
+      size, max_size = text.length, Settings.config[:post_max_length]
+      (size >= 1 && size <= max_size)
     end
 
-    def check_post_length(lines_array) # works on an array
-      check_length(lines_array, Settings.config[:post_max_length])
+    def message_size_ok?(message) # works on a string, returns boolean
+      text = keep_text_from_markdown_links(message)
+      size, max_size = text.length, Settings.config[:message_max_length]
+      (size >= 1 && size <= max_size)
     end
 
-    def check_message_length(lines_array) # works on an array
-      check_length(lines_array, Settings.config[:message_max_length])
+    def post_size_error(post)
+      text = keep_text_from_markdown_links(post)
+      size, max_size = text.length, Settings.config[:post_max_length]
+      bad_text_size(post, size, max_size)
     end
 
-    def check_length(lines_array, max_size)
-      words_array = []
-      lines_array.each { |word| words_array << get_markdown_text(word) }
-      size = words_array.join.length
+    def message_size_error(message)
+      text = keep_text_from_markdown_links(message)
+      size, max_size = text.length, Settings.config[:message_max_length]
+      bad_text_size(message, size, max_size)
+    end
+
+    def bad_text_size(post, size, max_size)
       if size < 1
-        error_text_empty
-        exit
+        error_text_empty()
       elsif size > max_size
         Errors.warn "Canceled: too long (#{size - max_size}chars)"
-        abort(Status.too_long(size, max_size))
+        @status.info("info", "your text:", "cyan")
+        puts post
+        @status.too_long(size, max_size)
+        exit
       end
     end
 
-    def get_markdown_text(str)
+    def keep_text_from_markdown_links(str)
       str.gsub(/\[([^\]]+)\]\(([^)]+)\)/, '\1')
     end
 
@@ -151,13 +157,10 @@ module Ayadn
         result.split('|||') #=> [text, link]
     end
 
-    def text_is_empty?(args)
-      args.empty? || args[0] == ""
-    end
-
     def error_text_empty
-      puts Status.no_text
-      Errors.warn "-Post without text-"
+      @status.no_text
+      Errors.warn "-No text-"
+      exit
     end
 
   end

data/lib/ayadn/profile.rb

@@ -5,7 +5,10 @@ module Ayadn
     attr_reader :options, :text, :payload
 
     def initialize options
-      abort(Status.profile_options) if options.empty?
+      if options.empty?
+        @status.profile_options
+        exit
+      end
       @options = options
     end
 
@@ -23,8 +26,8 @@ module Ayadn
       unless @options[:delete] || @options[:avatar] || @options[:cover]
         writer = Post.new
         input = writer.compose()
-        writer.check_post_length(input)
         @text = input.join("\n")
+        writer.post_size_error(@text) if writer.post_size_ok?(@text) == false
       end
     end