ruby-ampache 0.0.9 → 0.0.10

data/README.rdoc

@@ -6,6 +6,16 @@ Ruby-ampache is a really simple command line player for the ampache music server
 
 You need to have mplayer installed to use ruby-ampache. Mplayer is used for playing music streams.
 
+The big issue within this design is that if mplayer hangs up waiting on your ampache server
+you can enconter issues on adding songs to playlist and playing them
+
+the simple fix right now is to
+set TIMEOUT variable in your .ruby-ampache config file
+tuning it depending on your ampache server delay
+
+Yes, this should be handled different
+I'm free to any kind of suggestion on how to refactor this simple piece of software :)
+
 Gem can be installed as usual
 
     gem install ruby-ampache
@@ -18,8 +28,10 @@ example file:
     AMPACHE_USER="username"
     AMPACHE_USER_PSW="userpsw"
 
-	#optional (default is /usr/bin/mplayer)
-	MPLAYER_PATH="/usr/bin/mplayer"
+    #optional (default is /usr/bin/mplayer)
+    MPLAYER_PATH="/usr/bin/mplayer"
+    # try  to increase this value if you experience issues like "err on reading data"
+    TIMEOUT=20 #20 is a good value for a remote host
 	
 Simply execute ruby-ampache that should be found in you $PATH after installation
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bin/ruby-ampache

@@ -68,7 +68,7 @@ end
 def print_artists(artists)
     if artists.empty?
        reset_token 
-       say("token exausted, please retry")
+       say("No results, retrying")
        artists = @ar.artists 
     end
     choose do |menu|
@@ -106,6 +106,7 @@ end
 @ar =AmpacheRuby.new(ar_config.get_value('AMPACHE_HOST'),ar_config.get_value('AMPACHE_USER'), ar_config.get_value('AMPACHE_USER_PSW'))
 $options = {}
 $options[:path] = ar_config.get_value('MPLAYER_PATH')
+$options[:timeout] = ar_config.get_value('TIMEOUT').to_i
 @pl = AmpachePlaylist.new
 
 while true 
@@ -116,7 +117,7 @@ while true
         menu.choice("add another album to playlist") { print_artists(@ar.artists); say(HighLine.new.color(@pl.nowPlaying, :red)) }
         menu.choice("look for an artist") {  print_artists(@ar.artists(ask("Artist name?"))); say(HighLine.new.color(@pl.nowPlaying, :red)) }
         menu.choice("stop playing") { @pl.stop } 
-        menu.choice("pause playing") { @pl.pause; say(HighLine.new.color("paused!",:red)) } 
+        menu.choice("pause playing") { @pl.pause; say(HighLine.new.color("pause toggle!",:red)) } 
         menu.choice("about ruby-ampache") { say(HighLine.new.color credits, :red) }
         menu.choice("quit") { @pl.stop; exit} 
     end

data/lib/lib-classes.rb

@@ -61,24 +61,29 @@ end
 
 class AmpachePlaylist 
     def add(song)
+    puts song.title
         if !@pid
             $options[:path] ||= '/usr/bin/mplayer'
+            $options[:timeout] ||= 15
             mplayer_options = "-slave -quiet"
             mplayer = "#{$options[:path]} #{mplayer_options} \"#{song.url}\""
             @pid,@stdin,@stdout,@stderr = Open4.popen4(mplayer)
             begin
-                t = Timeout::timeout(3) do 
+                t = Timeout::timeout($options[:timeout]) do 
                     until @stdout.gets.inspect =~ /playback/ do
+                    # puts @stdout.gets.inspect
+
                     end
+
                 end
-            rescue Timeout::Error   
+            rescue Timeout::Error  
                 puts "err on reading data"
             end
         else
             begin
                 @stdin.puts "loadfile \"#{song.url}\" 1"
             rescue Errno::EPIPE
-                #puts "playlist is over" 
+                puts "error on adding song to playlist" 
                 @pid = nil
                 add(song)
              end
@@ -109,8 +114,8 @@ class AmpachePlaylist
     def next
         begin
             @stdin.puts "pt_step 1 1" if @pid
-        rescue Errno::EPIPE
-            puts "playlist is over" 
+        rescue Errno::EPIPE => e
+            puts "playlist is over on next" 
             @pid = nil
         end
     end
@@ -139,13 +144,14 @@ class AmpachePlaylist
                     return nowPlaying 
                 end
             end
-        rescue Errno::EPIPE
-            return "playlist is over" 
+        rescue Errno::EPIPE => e
             @pid = nil
+            return "playlist is over here" #, or you got an ERROR from mplayer: #{e.to_s}" 
+
         end
     end
     
-    # I borrowed these two method from the author of mplayer-ruby!
+    # I borrowed these two methods from the author of mplayer-ruby!
     # so my thanks to Artuh Chiu and his great gem mplayer-ruby
     def get(value)
       field = value.to_s
@@ -166,7 +172,11 @@ class AmpachePlaylist
         response = @stdout.gets
 #XXX escaping bad utf8 chars
         ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
-        response =ic.iconv(response + ' ')[0..-2]
+        if response
+          response =ic.iconv(response + ' ')[0..-2] 
+        else
+          response == ''
+        end
       end
       response.gsub("\e[A\r\e[K","")
     end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ampache
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors: 
 - ghedmat
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2011-02-22 00:00:00 +01:00
 default_executable: ruby-ampache
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -64,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -93,8 +81,8 @@ homepage: http://github.com/ghedamat/ruby-ampache
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,21 +90,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby ampache command line client