ruby-ampache 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/ruby-ampache

@@ -66,6 +66,11 @@ def print_albums(albums)
 end
 
 def print_artists(artists)
+    if artists.empty?
+       reset_token 
+       say("token exausted, please retry")
+       artists = @ar.artists 
+    end
     choose do |menu|
         menu.prompt = "Choose an artists or abort (1)"
         menu.choice(HighLine.new.color "ABORT", :red)  
@@ -75,6 +80,11 @@ def print_artists(artists)
     end
 end
 
+# try to reset token if it's not valid
+def reset_token
+    @ar.token = @ar.getAuthToken(@ar.user,@ar.psw)
+end
+
 def credits
     s = <<STR
 Ruby-Ampache: Ultra-simple, low-featured command line Ampache player
@@ -89,20 +99,23 @@ Usage: pick your choice from the menu.
        Songs are queued up into mplayer playlist
 
 STR
-return s
+    return s
 end
-ar =AmpacheRuby.new(ar_config.get_value('AMPACHE_HOST'),ar_config.get_value('AMPACHE_USER'), ar_config.get_value('AMPACHE_USER_PSW'))
-@pl = AmpachePlaylist.new
 
+# MAIN
+@ar =AmpacheRuby.new(ar_config.get_value('AMPACHE_HOST'),ar_config.get_value('AMPACHE_USER'), ar_config.get_value('AMPACHE_USER_PSW'))
+@pl = AmpachePlaylist.new
 
 while true 
     choose do |menu|
         menu.prompt = "pick your choice!"
         menu.choice("now playing") { say(HighLine.new.color(@pl.nowPlaying, :red)) }
         menu.choice("skip this song") { @pl.next; say(HighLine.new.color(@pl.nowPlaying, :red)) }
-        menu.choice("add another album") { print_artists(ar.artists); say(HighLine.new.color(@pl.nowPlaying, :red)) }
+        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("about ruby-ampache") { say(HighLine.new.color credits, :red) }
         menu.choice("quit") { @pl.stop; exit} 
     end
 end
+

data/lib/lib-ampache.rb

@@ -5,6 +5,17 @@ require 'digest/sha2'
 
 require File.join(File.dirname(__FILE__),'lib-ampache')
 
+=begin
+Class is initialized with Hostname, user and password
+An auth token is requested on class initialization
+
+To get the artist list from database you can 
+call the method artists(nil) and you'll get an array
+of AmpacheArtists. 
+
+To get albums from an artist you can issue
+artist_instance.albums or ampache_ruby.instance.albums(artist_instance)
+=end
 class AmpacheRuby
     
     
@@ -19,7 +30,8 @@ class AmpacheRuby
     end
 
     attr_accessor :host, :path, :user, :psw, :token, :playlist
-
+    
+    # tryies to obtain an auth token 
     def getAuthToken(user,psw)
         action= "handshake"
         # auth string
@@ -32,7 +44,8 @@ class AmpacheRuby
 
         return doc.at("auth").content
     end
-
+    
+    # generic api method call
     def callApiMethod( method, args={})
         args['auth'] ||= token if token
         url = path + "/server/xml.server.php?action=#{method}&#{args.keys.collect { |k| "#{k}=#{args[k]}"}.join('&')}" 
@@ -40,7 +53,8 @@ class AmpacheRuby
         return Nokogiri::XML(response.body)
     end
 
-
+    # retrive artists lists from database,
+    # name is an optional filter
     def artists(name = nil)
         args = {}
         args = { 'filter' => name.to_s } if name  # artist search 

data/lib/lib-classes.rb

@@ -1,4 +1,5 @@
 require 'open4'
+require 'timeout'
 class AmpacheArtist
     
     # include play module
@@ -66,7 +67,13 @@ class AmpachePlaylist
             mplayer_options = "-slave -quiet"
             mplayer = "#{options[:path]} #{mplayer_options} \"#{song.url}\""
             @pid,@stdin,@stdout,@stderr = Open4.popen4(mplayer)
-            until @stdout.gets.inspect =~ /playback/ do
+            begin
+                t = Timeout::timeout(3) do 
+                    until @stdout.gets.inspect =~ /playback/ do
+                    end
+                end
+            rescue Timeout::Error   
+                puts "err on reading data"
             end
         else
             begin
@@ -95,7 +102,6 @@ class AmpachePlaylist
     def next
         begin
             @stdin.puts "pt_step 1 1" if @pid
-            sleep 2 #XXX sleep time .. we can't be too fast on remote playing
         rescue Errno::EPIPE
             puts "playlist is over" 
             @pid = nil
@@ -106,11 +112,26 @@ class AmpachePlaylist
         return "Not playing man!" unless @pid
         begin
             s= ''
-            #s+= get("file_name") 
-            s+= get("meta_title")  
-            s+= get("meta_artist")  
-            s+= get("meta_album")  
-            return s.chomp
+            @tim = 0
+            begin
+                t = Timeout::timeout(3) do 
+                    #s+= get("file_name") 
+                    s+= get("meta_title")  
+                    s+= get("meta_artist")  
+                    s+= get("meta_album")  
+                    s.chomp!
+                end
+                @tim = 0
+                return s
+            rescue Timeout::Error
+                @tim += 1
+                if (@tim > 3 )
+                    @tim = 0
+                    return "err" 
+                else
+                    return nowPlaying 
+                end
+            end
         rescue Errno::EPIPE
             return "playlist is over" 
             @pid = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ampache
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - ghedmat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +02:00
+date: 2010-09-28 00:00:00 +02:00
 default_executable: ruby-ampache
 dependencies: 
 - !ruby/object:Gem::Dependency