cultome_player 2.0.0 → 2.0.2

data/lib/cultome_player/plugins/gestures.rb

@@ -0,0 +1,90 @@
+module CultomePlayer
+	module Plugins
+		module Gestures
+
+      include CultomePlayer::Objects
+
+			def init_plugin_gestures
+				register_listener(:after_command){|cmd, res| check_gesture(cmd) }
+			end
+
+			private
+
+			def actions_history
+				@history ||= []
+			end
+
+			def check_gesture(cmd)
+				if cmd.history?
+					actions_history << [cmd, Time.new]
+					check_looking_for_something
+				end
+			end
+
+      def recents(secs)
+				return actions_history.select{|cmd, time| time >= Time.new - secs}
+      end
+
+			def check_looking_for_something
+				if recents(60).count{|cmd, time| cmd.action == "next"} >= 5
+          delete_from_history "next"
+					suggest_songs
+				end
+			end
+
+      def delete_from_history(cmd)
+        actions_history.delete_if {|cmd, time| cmd.action == "next"}
+      end
+
+			def suggest_songs
+				display "Hey! cant find anything? Try one of these:"
+        suggestions = get_suggestions
+        display to_display_list(suggestions)
+        playlists[:focus] <= suggestions
+        return suggestions
+			end
+
+      def select_suggestion
+        return (1..10).to_a.sample(1).first
+      end
+
+      def get_suggestions
+        id = select_suggestion
+        if (1..7).cover?(id)
+          criteria = case id
+                     when 1 # los que tienen mas puntos
+                       "points desc"
+                     when 2 # los que tienen menos puntos
+                       "points"
+                     when 3 # las mas tocadas
+                       "plays desc"
+                     when 4 # los menos tocados
+                       "plays"
+                     when 5 # los agregados recientemente
+                       "created_at desc"
+                     when 6 # los recientemente tocados
+                       "last_played_at"
+                     when 7 # los recientemente tocados
+                       "points desc, plays desc"
+                     end
+
+          return Song.order(criteria).limit(5).to_a
+
+        else # mas complejos
+          case (id)
+          when 8 # Por artista popular
+            artist = Artist.order("points desc").limit(5).sample(1).first
+            return [] if artist.nil?
+            return artist.songs.sample(5)
+          when 9 # Por album popular
+            album = Album.order("points desc").limit(5).sample(1).first
+            return [] if album.nil?
+            return album.songs.sample(5)
+          else
+            return Song.all.sample(5)
+          end
+        end
+      end #sugestions
+    end
+	end
+end

data/lib/cultome_player/plugins/help.rb

@@ -14,15 +14,15 @@ module CultomePlayer
 	    	else
 	    		help = send("usage_#{cmd.params.first.value}")
 	    		if help.nil?
-	    			failure("No help is available for '#{cmd.first.value}'.")
+	    			failure("No help is available for '#{cmd.params.first.value}'.")
 	    		else
 	    			success(message: help)
 	    		end
 	    	end
 	    end
 
-	    def sintaxis_help
-	    	return /^literal (literal)$/
+	    def sintax_help
+	    	/^literal (literal)$/
 	    end
 
 	    # Description of the action help.
@@ -55,4 +55,4 @@ To see the usage for play command:
 	    end
 		end
 	end
-end
+end

data/lib/cultome_player/plugins/keyboard_special_keys.rb

@@ -0,0 +1,22 @@
+module CultomePlayer
+  module Plugins
+    module KeyboardSpecialKeys
+      def init_plugin_keyboard_special_keys
+        Thread.new do
+          start_cmd = "tail -f #{command_pipe}"
+          pipe = IO.popen(start_cmd, "rw")
+          pipe.each do |line|
+          #IO.popen(start_cmd).each do |line|
+            # planchamos el prompt...
+            display_over("")
+            # ejecutamos el comando
+            execute_interactively line
+            # y luego lo regeneramos
+            display_over c5(CultomePlayer::Interactive::PROMPT)
+          end # IO
+        end # Thread
+      end
+    end # module
+  end
+end
+

data/lib/cultome_player/plugins/points.rb

@@ -0,0 +1,51 @@
+module CultomePlayer
+	module Plugins
+		module Points
+			def init_plugin_points
+				register_listener(:playback_finish){|song| on_playback_finish(song) }
+				register_listener(:before_command_next){|cmd, res| on_before_change(cmd) }
+				register_listener(:before_command_prev){|cmd, res| on_before_change(cmd) }
+				register_listener(:after_command_prev){|cmd, res| on_after_prev(cmd, res) }
+			end
+
+			private
+
+			def on_before_change(cmd)
+        # current_song => the old song
+				return if current_song.nil?
+
+				percent_played = playback_position * 100 / playback_length
+        gain = case percent_played
+                 when (10..50) then -1
+                 when (81..100) then 1
+                 else 0
+               end
+
+        update_points(gain)
+      end
+
+      def on_after_prev(cmd, response)
+        # # current_song => the new song
+        return if current_song.nil?
+
+        if response.success?
+          update_points(1)
+        end
+      end
+
+      def on_playback_finish(song)
+        update_points(1)
+      end
+
+      def update_points(diff)
+        if current_song
+          current_song.update(points: current_song.points + diff)
+          current_song.artist.update(points: current_song.artist.points + diff) unless current_song.artist.nil?
+          current_song.album.update(points: current_song.album.points + diff) unless current_song.album.nil?
+          current_song.genres.each{|g| g.update(points: g.points + diff) } unless current_song.genres.nil?
+        end
+      end
+
+    end
+  end
+end

data/lib/cultome_player/utils.rb

@@ -1,8 +1,16 @@
+require 'cultome_player/objects'
 require 'active_record'
+require 'colorize'
 
 module CultomePlayer
   module Utils
 
+    def to_display_list(list)
+      return list.collect.with_index do |elem, idx|
+        c4("#{(idx + 1).to_s.ljust(3)} | ") + elem.to_s
+      end.join("\n")
+    end
+
     # Check if a string value can be a positive boolean value.
     #
     # @param value [String] String to check if can be a positive boolean value.
@@ -17,7 +25,7 @@ module CultomePlayer
     # @return [String] The value printed.
     def display(msg)
       stdout.puts msg
-      return msg
+      return "#{msg}\n"
     end
 
     # Print a string into stdout (not STDOUT) but before insert a carriage return and dont append a newline character at the end.
@@ -25,14 +33,34 @@ module CultomePlayer
     # @param msg [String] The value to be printed.
     # @return [String] The value printed.
     def display_over(msg)
-      stdout.print "\r#{msg}"
+      msg = "\r#{msg}"
+      stdout.print msg
       return msg
     end
 
-    # Define the 15 colors allowed in my console scheme
-    (1..15).each do |idx|
+    # Define the 18 colors allowed in my console scheme
+    (1..18).each do |idx|
       define_method :"c#{idx}" do |str|
-        str
+        case idx
+          when 1 then str.colorize(:blue)
+          when 2 then str.colorize(:black)
+          when 3 then str.colorize(:red)
+          when 4 then str.colorize(:green)
+          when 5 then str.colorize(:yellow)
+          when 6 then str.colorize(:blue)
+          when 7 then str.colorize(:magenta)
+          when 8 then str.colorize(:cyan)
+          when 9 then str.colorize(:white)
+          when 10 then str.colorize(:default)
+          when 11 then str.colorize(:light_black)
+          when 12 then str.colorize(:light_red)
+          when 13 then str.colorize(:light_green)
+          when 14 then str.colorize(:light_yellow)
+          when 15 then str.colorize(:light_blue)
+          when 16 then str.colorize(:light_magenta)
+          when 17 then str.colorize(:light_cyan)
+          when 18 then str.colorize(:light_white)
+        end
       end
     end
 
@@ -45,11 +73,11 @@ module CultomePlayer
     def arrange_in_columns(cols, widths, border)
       row = ""
       idxs = cols.collect{|c| 0 }
-      
+
       while cols.zip(idxs).any?{|col| col[0].length > col[1] }
         cols.each.with_index do |col, idx|
           slice_width = widths[idx]
-          
+
           slice = col.slice(idxs[idx], slice_width) || "" # sacamos el pedazo de la columna
           row << slice.ljust(slice_width) # concatenamos a la fila
           idxs[idx] += slice_width # recorremos el indice
@@ -91,5 +119,87 @@ module CultomePlayer
 
       ActiveRecord::Base.connection_pool.with_connection(&db_logic)
     end
+
+    def ensure_db_schema
+      begin
+        # hacemos una simple query a la base de datos para verificar
+        with_connection{ CultomePlayer::Objects::Song.first }
+      rescue
+        # si la query no funciona recreamos el esquema
+        recreate_db_schema
+      end
+    end
+
+    def recreate_db_schema
+      with_connection do
+        swallow_stdout do
+          begin
+            ActiveRecord::Schema.drop_table('songs')
+            ActiveRecord::Schema.drop_table('albums')
+            ActiveRecord::Schema.drop_table('artists')
+            ActiveRecord::Schema.drop_table('genres')
+            ActiveRecord::Schema.drop_table('genres_songs')
+            ActiveRecord::Schema.drop_table('drives')
+          rescue
+          end
+
+          begin
+            ActiveRecord::Schema.define do
+              create_table :songs do |t|
+                t.string :name # If I Had A Gun
+                t.integer :artist_id, default: 0 # Noel Gallagher
+                t.integer :album_id, default: 0 # High Flying Birds
+                t.integer :year # 2011
+                t.integer :track # 3
+                t.integer :duration # 210 sec
+                t.integer :drive_id
+                t.string :relative_path
+                t.integer :points, default: 0
+                t.integer :plays, default: 0
+                t.datetime :last_played_at
+                t.timestamps
+              end
+
+              create_table :albums do |t|
+                t.string :name
+                t.integer :points, default: 0
+                t.timestamps
+              end
+
+              create_table :artists do |t|
+                t.string :name
+                t.integer :points, default: 0
+                t.timestamps
+              end
+
+              create_table :genres do |t|
+                t.integer :points, default: 0
+                t.string :name
+              end
+
+              create_table :genres_songs, id: false do |t|
+                t.integer :song_id
+                t.integer :genre_id
+              end
+
+              create_table :drives do |t|
+                t.string :name
+                t.string :path
+                t.boolean :connected, default: true
+                t.timestamps
+              end
+            end
+          rescue
+          end # begin
+        end # swallow_stdout
+
+        # Default and required values
+        CultomePlayer::Objects::Album.find_or_create_by(id: 0, name: 'Unknown')
+        CultomePlayer::Objects::Artist.find_or_create_by(id: 0, name: 'Unknown')
+
+        return true
+      end
+    end
+
   end
 end

data/lib/cultome_player/version.rb

@@ -1,3 +1,3 @@
 module CultomePlayer
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/xbindkeys/xbindkeysrc

@@ -0,0 +1,12 @@
+# Next
+"cultome_player --signal next"
+    Mod2 + XF86Forward
+# Prev
+"cultome_player --signal prev"
+    Mod2 + XF86Back
+# Toggle pause
+"cultome_player --signal pause"
+    Mod2 + Cancel
+# Repeat
+"cultome_player --signal repeat"
+    Mod2 + XF86Reload

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: cultome_player
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Carlos Soria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A console music library explorer and player
@@ -199,10 +199,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -210,7 +206,6 @@ files:
 - bin/cultome_player
 - config/environment.yml
 - cultome_player.gemspec
-- db/001_create_schema.rb
 - lib/cultome_player.rb
 - lib/cultome_player/command.rb
 - lib/cultome_player/command/language.rb
@@ -239,37 +234,15 @@ files:
 - lib/cultome_player/player/interface/helper.rb
 - lib/cultome_player/player/playlist.rb
 - lib/cultome_player/plugins.rb
+- lib/cultome_player/plugins/alias.rb
+- lib/cultome_player/plugins/gestures.rb
 - lib/cultome_player/plugins/help.rb
+- lib/cultome_player/plugins/keyboard_special_keys.rb
+- lib/cultome_player/plugins/points.rb
 - lib/cultome_player/state_checker.rb
 - lib/cultome_player/utils.rb
 - lib/cultome_player/version.rb
-- spec/config.yml
-- spec/cultome_player/command/processor_spec.rb
-- spec/cultome_player/command/reader_spec.rb
-- spec/cultome_player/cultome_player_spec.rb
-- spec/cultome_player/environment_spec.rb
-- spec/cultome_player/events_spec.rb
-- spec/cultome_player/media_spec.rb
-- spec/cultome_player/player/adapter/mpg123_spec.rb
-- spec/cultome_player/player/interface/basic_spec.rb
-- spec/cultome_player/player/interface/extended/connect_spec.rb
-- spec/cultome_player/player/interface/extended/search_spec.rb
-- spec/cultome_player/player/interface/extended/show_spec.rb
-- spec/cultome_player/player/interface/extended/shuffle_spec.rb
-- spec/cultome_player/player/interface/extended_spec.rb
-- spec/cultome_player/player/interface/helper_spec.rb
-- spec/cultome_player/player/interface_spec.rb
-- spec/cultome_player/player/playlist_spec.rb
-- spec/cultome_player/plugins/help_spec.rb
-- spec/cultome_player/plugins_spec.rb
-- spec/cultome_player/utils_spec.rb
-- spec/spec_helper.rb
-- spec/test/uno/dos/dos.mp3
-- spec/test/uno/dos/tres/tres.mp3
-- spec/test/uno/uno.mp3
-- tasks/console.rake
-- tasks/db.rake
-- tasks/run.rake
+- xbindkeys/xbindkeysrc
 homepage: https://github.com/cultome/cultome_player
 licenses:
 - MIT
@@ -280,43 +253,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CulToMe Player
-test_files:
-- spec/config.yml
-- spec/cultome_player/command/processor_spec.rb
-- spec/cultome_player/command/reader_spec.rb
-- spec/cultome_player/cultome_player_spec.rb
-- spec/cultome_player/environment_spec.rb
-- spec/cultome_player/events_spec.rb
-- spec/cultome_player/media_spec.rb
-- spec/cultome_player/player/adapter/mpg123_spec.rb
-- spec/cultome_player/player/interface/basic_spec.rb
-- spec/cultome_player/player/interface/extended/connect_spec.rb
-- spec/cultome_player/player/interface/extended/search_spec.rb
-- spec/cultome_player/player/interface/extended/show_spec.rb
-- spec/cultome_player/player/interface/extended/shuffle_spec.rb
-- spec/cultome_player/player/interface/extended_spec.rb
-- spec/cultome_player/player/interface/helper_spec.rb
-- spec/cultome_player/player/interface_spec.rb
-- spec/cultome_player/player/playlist_spec.rb
-- spec/cultome_player/plugins/help_spec.rb
-- spec/cultome_player/plugins_spec.rb
-- spec/cultome_player/utils_spec.rb
-- spec/spec_helper.rb
-- spec/test/uno/dos/dos.mp3
-- spec/test/uno/dos/tres/tres.mp3
-- spec/test/uno/uno.mp3
-has_rdoc: 
+test_files: []