cultome_player 2.0.0 → 2.0.2

data/lib/cultome_player/command/reader.rb

@@ -8,7 +8,16 @@ module CultomePlayer::Command
     # @param prompt [String] The message to display to user for arcking for input.
     # @return [String] The user input readed.
     def read_command(prompt)
-      command_reader.readline(prompt, true)
+      input = command_reader.readline(c5(prompt), true)
+
+      # evitamos que comando consecutivos repetidos o vacios queden en el historial
+      if input.empty?
+        command_reader::HISTORY.pop
+      elsif command_reader::HISTORY.to_a.reverse[1] == input
+        command_reader::HISTORY.pop
+      end
+
+      return input
     end
 
     # Lazy getter for readline object.
@@ -69,7 +78,7 @@ module CultomePlayer::Command
           expanded_path += "/" if File.directory?(expanded_path)
           Dir[expanded_path + "*"].grep(/^#{Regexp.escape(expanded_path)}/).collect{|d| "#{d}/"}
         elsif word.start_with?("@")
-          %w{@library @search @playlist @history @queue @song @artist @album @drives}.grep(/^#{word}/)
+          %w{@playlist @current @history @queue @search @song @artist @album @drives @artists @albums @genres @library @recently_added @recently_played @most_played @less_played @populars}.grep(/^#{word}/)
         end
       end
     end

data/lib/cultome_player/environment.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'rake'
 
 module CultomePlayer
   module Environment
@@ -39,6 +38,13 @@ module CultomePlayer
       env_config['config_file'] || raise('environment problem:environment information not loaded')
     end
 
+    # Get the command_pipe environment configuration value.
+    #
+    # @return [String] The command_pipe value for teh selected environment.
+    def command_pipe
+      env_config['command_pipe'] || raise('environment problem:environment information not loaded')
+    end
+
     # Get the mplayer_pipe environment configuration value.
     #
     # @return [String] The mplayer_pipe value for teh selected environment.
@@ -74,29 +80,31 @@ module CultomePlayer
       @current_env
     end
 
+    def load_environment_properties(env)
+      env_config = YAML.load_file File.expand_path('config/environment.yml', File.join(File.dirname(__FILE__), "../.."))
+      @env_config = env_config[env.to_s]
+      expand_paths @env_config
+      @current_env = env.to_sym
+      return @env_config
+    end
+
     # Extract the configuration for the environment and setup valriables.
     #
     # @param env [Symbol] The name of the environment to load.
     # @param check_db [Boolean] Flag to decide if the database schema should be checked.
-    def prepare_environment(env, check_db=true)
-      env_config = YAML.load_file File.expand_path('config/environment.yml')
-      @env_config = env_config[env.to_s]
-      @current_env = env.to_sym
+    def prepare_environment(env)
+      load_environment_properties(env)
       raise 'environment problem:environment not found' if @env_config.nil?
-      expand_paths @env_config
       create_required_files @env_config
       load_master_config @env_config['config_file']
-      check_db_schema if check_db
     end
 
-    private
-
-    def check_db_schema
-      Rake.load_rakefile 'Rakefile'
-      Rake.application.load_imports
-      swallow_stdout{ Rake.application.invoke_task("db:create[#{current_env}]") }
+    def save_player_configurations
+      open(config_file, 'w'){|f| f.write player_config.to_yaml }
     end
 
+    private
+
     def load_master_config(config_file)
       @player_config = YAML.load_file(config_file) || {}
       @player_config['main'] ||= {}

data/lib/cultome_player/events.rb

@@ -8,14 +8,14 @@ module CultomePlayer
       @listeners ||= Hash.new{|h,k| h[k] = [] }
     end
 
-    # Register a listener to an event.
+    # Register a callback to an event.
     #
     # @param event [Symbol] The event name.
-    # @param listener [Object] Implements a callback with the name on_<event name>.
-    # @return [Object] The registered listener.
-    def register_listener(event, listener)
-      listeners[event] << listener
-      return listener
+    # @param callback [Object] Implements a callback with the name on_<event name>.
+    # @return [Object] The registered callback.
+    def register_listener(event, &callback)
+      listeners[event] << callback
+      return callback
     end
 
     # Broadcast an event to all the registered listeners.
@@ -23,7 +23,7 @@ module CultomePlayer
     # @param event [Symbol] The event name.
     # @param data [Array] The information sended to the listeners.
     def emit_event(event, *data)
-      listeners[event].collect{|l| l.send("on_#{event}".to_sym, *data) }
+      listeners[event].collect{|l| l.call(*data) }
     end
   end
 end

data/lib/cultome_player/objects/album.rb

@@ -4,18 +4,25 @@ module CultomePlayer
   module Objects
     # The ActiveRecord model for Album objects.
     class Album < ActiveRecord::Base
+
+      include CultomePlayer::Utils
+
       has_many :songs
       has_many :artists, through: :songs
 
       def to_s
         str = c4(":::: Album: ")
-        str += c13(self.name)
+        str += c16(self.name)
         str += c4(" \\ Artist: ")
         unless self.artists.nil? || self.artists.empty?
           str += c11(self.artists.uniq.collect{|a| a.name}.join(', '))
         end
         str += c4(" ::::")
       end
+
+      def readonly?
+        false
+      end
     end
   end
-end
+end

data/lib/cultome_player/objects/artist.rb

@@ -4,15 +4,22 @@ module CultomePlayer
   module Objects
     # The ActiveRecord model for Artist objects.
     class Artist < ActiveRecord::Base
+
+      include CultomePlayer::Utils
+
       has_many :songs
       has_many :albums, through: :songs
       has_many :similars, as: :similar
 
       def to_s
         str = c4(":::: Artist: ")
-        str += c11(self.name)
+        str += c15(self.name)
         str += c4(" ::::")
       end
+
+      def readonly?
+        false
+      end
     end
   end
-end
+end

data/lib/cultome_player/objects/command.rb

@@ -7,6 +7,11 @@ module CultomePlayer
       def initialize(action, parameters)
         @action = action[:value]
         @parameters = parameters.collect{|p| Parameter.new(p) }
+        @no_history = params(:literal).any?{|p| p.value == 'no_history'}
+      end
+
+      def history?
+        !@no_history
       end
 
       # Returns the parameters, optionally filtered by type
@@ -32,6 +37,10 @@ module CultomePlayer
       def params_values(type)
         params(type).map{|p| p.value }
       end
+
+      def to_s
+        "#{action} #{@parameters.join(" ")}"
+      end
     end
   end
-end
+end

data/lib/cultome_player/objects/drive.rb

@@ -4,6 +4,9 @@ module CultomePlayer
   module Objects
     # The ActiveRecord model for Drive objects.
     class Drive < ActiveRecord::Base
+
+      include CultomePlayer::Utils
+
       has_many :songs
 
       def connected?
@@ -23,4 +26,4 @@ module CultomePlayer
       end
     end
   end
-end
+end

data/lib/cultome_player/objects/genre.rb

@@ -4,6 +4,9 @@ module CultomePlayer
   module Objects
     # The ActiveRecord model for Genre objects.
     class Genre < ActiveRecord::Base
+
+      include CultomePlayer::Utils
+
       has_and_belongs_to_many :songs
 
       def to_s
@@ -13,4 +16,4 @@ module CultomePlayer
       end
     end
   end
-end
+end

data/lib/cultome_player/objects/parameter.rb

@@ -23,6 +23,13 @@ module CultomePlayer
         return is_true_value?(@data[:value]) if @data[:type] == :boolean
         return @data[:value].to_i if @data[:type] == :number
         return @data[:value].to_sym if @data[:type] == :object
+        return raw_value
+      end
+
+      # Return the value as the user input typed (no conversions).
+      #
+      # @return [String] The values of the parameter as the user typed.
+      def raw_value
         @data[:value]
       end
 
@@ -32,6 +39,19 @@ module CultomePlayer
       def type
         @data[:type]
       end
+
+      def to_s
+        return case @data[:type]
+          when :literal then @data[:value]
+          when :criteria then "#{@data[:criteria]}:#{@data[:value]}"
+          when :number then @data[:value]
+          when :object then "@#{@data[:value]}"
+          when :boolean then @data[:value]
+          when :path then @data[:value]
+          when :bubble then @data[:value]
+          else value
+        end
+      end
     end
   end
-end
+end

data/lib/cultome_player/objects/response.rb

@@ -8,7 +8,7 @@ module CultomePlayer
         @data = data
 
         @data.each do |k,v|
-          self.class.send(:define_method, k) do
+          self.singleton_class.send(:define_method, k) do
             v
           end
         end
@@ -37,6 +37,10 @@ module CultomePlayer
         data = @data.merge response.data
         return Response.new(type, data)
       end
+
+      def to_s
+        "Response #{success? ? 'successful' : 'failed'} => #{@data}"
+      end
     end
   end
 end

data/lib/cultome_player/objects/song.rb

@@ -2,8 +2,12 @@ require 'active_record'
 
 module CultomePlayer
   module Objects
+
     # The ActiveRecord model for Song objects.
     class Song < ActiveRecord::Base
+
+      include CultomePlayer::Utils
+
       belongs_to :artist
       belongs_to :album
       has_and_belongs_to_many :genres
@@ -11,6 +15,7 @@ module CultomePlayer
       has_many :similars, as: :similar
 
       scope :connected, -> {joins(:drive).where('drives.connected' => true)}
+
       # Get the full path to the song file.
       #
       # @return [String] The full path to the song file.
@@ -20,19 +25,19 @@ module CultomePlayer
 
       def to_s
         str = c4(":::: Song: ")
-        str += c10(self.name)
+        str += c14(self.name)
 
         unless self.artist.nil?
           str += c4(" \\ Artist: ")
-          str += c11(self.artist.name)
+          str += c15(self.artist.name)
         end
 
         unless self.album.nil?
           str += c4(" \\ Album: ")
-          str += c13(self.album.name)
+          str += c16(self.album.name)
         end
         str += c4(" ::::")
       end
     end
   end
-end
+end

data/lib/cultome_player/player/adapter/mpg123.rb

@@ -109,16 +109,15 @@ module CultomePlayer::Player::Adapter
 	          		when 0 # stopped
 	          			@playing = @paused = false
 	            		@stopped = true
-                  emit_event(:playback_finish) unless @user_stopped
-                  @user_stopped = false
+                  @user_stopped ?  emit_event(:playback_stopped, current_song) : emit_event(:playback_finish, current_song)
 	          		when 1 # paused
 			            @stopped = @playing = false
 			            @paused = true
-                  emit_event(:playback_paused)
+                  emit_event(:playback_paused, current_song)
 	          		when 2 # unpaused
 									@playing = true
 	            		@paused = @stopped = false
-                  emit_event(:playback_resumed)
+                  emit_event(:playback_resumed, current_song)
             	end
             when /^@F ([\d]+) ([\d]+) ([\d.]+) ([\d.]+)$/
 	            @playback_time_position = $3.to_f

data/lib/cultome_player/player/interactive.rb

@@ -6,18 +6,49 @@ module CultomePlayer::Player
     # Begin a REP loop inside player.
     def begin_session
       @in_session = true
-      display "Cultome Player v#{CultomePlayer::VERSION}"
+      display c5("Cultome Player v#{CultomePlayer::VERSION}")
+      emit_event(:interactive_session_started)
 
       while in_session?
         begin
-          r = execute read_command(PROMPT)
-          show_response(r)
+          cmd = read_command(PROMPT)
+          execute_interactively cmd
         rescue Exception => e
-          display e.message
+          show_error(e.message)
+          e.backtrace.each{|b| display c3(b) } if current_env == :test
         end
       end
     end
 
+    def execute_interactively(cmd)
+      begin
+        if cmd.empty?
+          # tomamos en ultimo comando
+          cmd = last_command
+
+        else
+          # agregamos el comando al historia de la session_history
+          session_history << cmd
+          # seteamos el ultimo comando ejecutado
+          # # seteamos el ultimo comando ejecutado
+          set_last_command(cmd)
+        end
+
+        return false if cmd.nil?
+
+        r = execute cmd
+
+        if r.size > 1
+          display c1("#{r.size} commands were executed, Showing result of the last one.")
+        end
+
+        show_response(r.last)
+      rescue Exception => e
+        emit_event(:interactive_exception, e)
+        raise e
+      end
+    end
+
     # Check if there is an interactive session in progress.
     #
     # @return [Boolean] True if session in progress. False otherwise.
@@ -28,27 +59,52 @@ module CultomePlayer::Player
     # Terminates a interactive session.
     def terminate_session
       @in_session = false
+      save_player_configurations
+      emit_event(:interactive_session_ended)
+    end
+
+    # Command history of this session
+    #
+    # @return [Array<Command>] The history of commands of this session.
+    def session_history
+      @session_history ||= []
+    end
+
+    def set_last_command(cmd)
+      @last_command = cmd
+    end
+
+    def last_command
+      @last_command
     end
 
     private
 
+    def show_error(msg)
+      type, message = msg.split(":")
+      display c3("[#{type}] #{message}")
+    end
+
     def show_response(r)
+      return if r.respond_to?(:no_response)
+
       if r.respond_to?(:response_type)
         res_obj = r.send(r.response_type)
         if res_obj.respond_to?(:each)
-          res_obj.each.with_index do |elem, idx|
-            display "#{(idx + 1).to_s.ljust(3)} | #{elem.to_s}"
-          end
+          # es una lista
+          display to_display_list(res_obj)
         elsif res_obj.class == String
-          display res_obj.to_s
+          # es un mensaje
+          display r.success? ? res_obj : c3(res_obj.to_s)
         else
-          display "(((#{res_obj.to_s})))"
+          display c3("(((#{res_obj.to_s})))")
         end
 
+        # Dont has response_type, eg has a message
       elsif r.respond_to?(:message)
-        display r.message
+        display r.success? ? c15(r.message) : c3(r.message)
       else
-        display "!!!#{r}!!!"
+        display c3("!!! #{r} !!!")
       end
     end