ruby-ampache 0.0.10 → 0.1.1

data/README.rdoc

@@ -6,15 +6,11 @@ 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
+I've recently changed the way mplayer is invoked as mplayer slave mode is great, 
+but not good to manage playlists..
+I'm still testing it right now but it should work far better.
 
-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 :)
+A few options have been added to the menu and most of all it is full of colors now!
 
 Gem can be installed as usual
 
@@ -27,11 +23,8 @@ example file:
     AMPACHE_HOST="http://path_to_your_ampache_host"
     AMPACHE_USER="username"
     AMPACHE_USER_PSW="userpsw"
-
     #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
 
@@ -42,6 +35,10 @@ Also sometimes if mplayer get stucked playing a song the app does the same.
 
 If you found more issues please let me know and I'll try to fix them as soon as possible
 
+* fix encoding issues with file metadata retrieved from mplayer
+
+
+
 == Notes
 Special thanks goes to the developer of mplayer-ruby gem.
 I've borrowed a couple of methods from his useful library
@@ -50,8 +47,6 @@ I've borrowed a couple of methods from his useful library
  
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.1.1

data/bin/ruby-ampache

@@ -2,12 +2,12 @@
 # encoding:  UTF-8
 
 def secure_require(name)
-    begin 
-        require name
-    rescue LoadError
-        $stderr.print "#{File.basename(__FILE__)} requires #{name} gem to work\n Pleas install it with: gem install #{name}\n"
-        exit
-    end
+  begin
+    require name
+  rescue LoadError
+    $stderr.print "#{File.basename(__FILE__)} requires #{name} gem to work\n Pleas install it with: gem install #{name}\n"
+    exit
+  end
 end
 
 require 'rubygems'
@@ -16,77 +16,105 @@ secure_require 'highline/import'
 secure_require 'parseconfig'
 secure_require 'nokogiri'
 secure_require 'iconv'
-require File.join(File.dirname(__FILE__),'..','lib','lib-ampache')
-require File.join(File.dirname(__FILE__),'..','lib','lib-classes')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'lib-ampache')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'lib-classes')
 
 # XXX monkey patch for utf8 on ruby 1.9
 if /^1\.9/ === RUBY_VERSION then
-    class HighLine
-        def wrap (text)
-            text = text.force_encoding("UTF-8")
-            wrapped = [ ]
-            text.each_line do |line|
-              while line =~ /([^\n]{#{@wrap_at + 1},})/
-                search  = $1.dup
-                replace = $1.dup
-                if index = replace.rindex(" ", @wrap_at)
-                  replace[index, 1] = "\n"
-                  replace.sub!(/\n[ \t]+/, "\n")
-                  line.sub!(search, replace)
-                else
-                  line[$~.begin(1) + @wrap_at, 0] = "\n"
-                end
-              end
-              wrapped << line
-            end
-            return wrapped.join
+  class HighLine
+    def wrap (text)
+      text = text.force_encoding("UTF-8")
+      wrapped = []
+      text.each_line do |line|
+        while line =~ /([^\n]{#{@wrap_at + 1},})/
+          search = $1.dup
+          replace = $1.dup
+          if index = replace.rindex(" ", @wrap_at)
+            replace[index, 1] = "\n"
+            replace.sub!(/\n[ \t]+/, "\n")
+            line.sub!(search, replace)
+          else
+            line[$~.begin(1) + @wrap_at, 0] = "\n"
+          end
         end
+        wrapped << line
+      end
+      return wrapped.join
     end
+  end
 end
 
 # Ampache ruby parameters
 begin
-ar_config = ParseConfig.new(File.expand_path('~/.ruby-ampache'))
+  ar_config = ParseConfig.new(File.expand_path('~/.ruby-ampache'))
 rescue
-   raise "\nPlease create a .ruby-ampache file on your home\n See http://github.com/ghedamat/ruby-ampache for infos\n"
+  raise "\nPlease create a .ruby-ampache file on your home\n See http://github.com/ghedamat/ruby-ampache for infos\n"
 end
 
 # ruby-ampache highline version
 $terminal.wrap_at = 80
 $terminal.page_at = 22
 
+def print_songs(album)
+  choose do |menu|
+    menu.prompt = "PICK A SONG (4..N), ADD WHOLE ALBUM (3), GO BACK(2) or BACK TO MENU(1)"
+    menu.choice(HighLine.new.color "BACK TO MENU", :red)
+    menu.choice(HighLine.new.color "BACK", :magenta) { print_albums(album.artist.albums) }
+    menu.choice(HighLine.new.color "ADD WHOLE ALBUM", :green) { album.add_to_playlist(@pl); print_albums(album.artist.albums) }
+    album.songs.each do |s|
+      menu.choice(s.title) { s.add_to_playlist(@pl); print_songs(album) }
+
+    end
+  end
+end
+
 def print_albums(albums)
-     choose do |menu|
-        menu.prompt = "Choose an album or abort (1) "
-        menu.choice(HighLine.new.color "ABORT", :red)   
-        albums.each do |a|
-            menu.choice(a.name) { a.addToPlaylist(@pl)}  
-        end
-    end   
+  choose do |menu|
+    menu.prompt = "CHOOSE AN ALBUM (4..N), ADD WHOLE ARTIST(3), BACK TO LIST(2) or BACK TO MENU (1) "
+    menu.choice(HighLine.new.color "BACK TO MENU", :red)
+    menu.choice(HighLine.new.color "BACK", :magenta) { print_artists(@ar.artists) }
+    menu.choice(HighLine.new.color "ADD WHOLE ARTIST", :green) { albums.first.artist.add_to_playlist(@pl); print_artists(@ar.artists) }
+
+    albums.each do |a|
+      menu.choice(a.name) { print_songs(a) }
+    end
+  end
 end
 
 def print_artists(artists)
-    if artists.empty?
-       reset_token 
-       say("No results, retrying")
-       artists = @ar.artists 
-    end
-    choose do |menu|
-        menu.prompt = "Choose an artists or abort (1)"
-        menu.choice(HighLine.new.color "ABORT", :red)  
-        artists.each do |a|
-            menu.choice(a.name) { print_albums(a.albums) }  
-        end
+  if artists.empty?
+    reset_token
+    say("No results, retrying")
+    artists = @ar.artists
+  end
+  choose do |menu|
+    menu.prompt = "CHOOSE AN ARTIST (2..N) or  BACK TO MENU (1)"
+    menu.choice(HighLine.new.color "BACK TO MENU", :red)
+    artists.each do |a|
+      menu.choice(a.name) { print_albums(a.albums) }
     end
+  end
+end
+
+def print_playlist
+  if @pl.list.empty?
+    say(HighLine.new.color "No more songs!\n",:red)
+    return
+  end
+  say(HighLine.new.color "Next Songs:", :yellow)
+  @pl.list.each_with_index do |p,i|
+    say(HighLine.new.color(i.to_s + " : ", :green) + p.title)
+  end
+  puts ""
 end
 
 # try to reset token if it's not valid
 def reset_token
-    @ar.token = @ar.getAuthToken(@ar.user,@ar.psw)
+  @ar.token = @ar.getAuthToken(@ar.user, @ar.psw)
 end
 
 def credits
-    s = <<STR
+  s = <<STR
 Ruby-Ampache: Ultra-simple, low-featured command line Ampache player (uses mplayer for playing)
 Author: Mattia Gheda aka ghedamat
 Homepage: http://github.com/ghedamat/ruby-ampache
@@ -94,32 +122,34 @@ Author-mail: thamayor@gmail.com
 
 Usage: pick your choice from the menu. 
        You can start playing songs from your ampache server right now! 
-       Simply choose an artist and than an album
+       Simply choose an artist,an album or a single song
        You can queue up as many albums you like
-       Songs are queued up into mplayer playlist
-
 STR
-    return s
+  return s
 end
 
 # MAIN
-@ar =AmpacheRuby.new(ar_config.get_value('AMPACHE_HOST'),ar_config.get_value('AMPACHE_USER'), ar_config.get_value('AMPACHE_USER_PSW'))
+@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 
-    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 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("pause toggle!",:red)) } 
-        menu.choice("about ruby-ampache") { say(HighLine.new.color credits, :red) }
-        menu.choice("quit") { @pl.stop; exit} 
-    end
+say(HighLine.new.color "Welcome To ruby Ampache\n", :green)
+while true
+  choose do |menu|
+    menu.prompt = HighLine.new.color("pick your choice!\n", :yellow)
+    menu.choice(HighLine.new.color("add artist/album/song to the playlist", :green)) { print_artists(@ar.artists); say(HighLine.new.color(@pl.now_playing, :red)) }
+    menu.choice(HighLine.new.color("search artist", :green)) { print_artists(@ar.artists(ask(HighLine.new.color("Artist name?", :red)))); say(HighLine.new.color(@pl.now_playing, :red)) }
+
+    menu.choice(HighLine.new.color("now playing", :magenta)) { say(HighLine.new.color(@pl.now_playing, :red)) }
+    menu.choice(HighLine.new.color("view next songs", :magenta)) {print_playlist}
+    menu.choice(HighLine.new.color("skip current song", :magenta)) { @pl.next; sleep 1;say(HighLine.new.color(@pl.now_playing, :red)) }
+    menu.choice(HighLine.new.color "stop playing and clear playlist", :magenta) { @pl.stop }
+
+    menu.choice(HighLine.new.color "pause playing",:magenta) { @pl.pause; say(HighLine.new.color("pause toggle!", :red)) }
+    menu.choice(HighLine.new.color "help and about", :yellow) { say(HighLine.new.color credits, :red) }
+    menu.choice("quit") { @pl.stop; exit }
+  end
 end
 

data/lib/lib-ampache.rb

@@ -3,7 +3,7 @@ require 'net/http'
 require 'open-uri'
 require 'digest/sha2'
 
-require File.join(File.dirname(__FILE__),'lib-ampache')
+require File.join(File.dirname(__FILE__), 'lib-ampache')
 
 =begin
 Class is initialized with Hostname, user and password
@@ -13,78 +13,91 @@ 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
+To get albums from an artist you can use
 artist_instance.albums or ampache_ruby.instance.albums(artist_instance)
 =end
+
 class AmpacheRuby
-    
-    
-    def initialize(host,user,psw)
-        uri = URI.parse(host)
-        @host = uri.host
-        @path = uri.path
-        @user = user
-        @psw = psw
-        @token = nil
-        @token = getAuthToken(user,psw)
-    end
 
-    attr_accessor :host, :path, :user, :psw, :token, :playlist
-    
-    # tryies to obtain an auth token 
-    def getAuthToken(user,psw)
-        action= "handshake"
-        # auth string
-        key =  Digest::SHA2.new << psw 
-        time = Time.now.to_i.to_s
-        psk = Digest::SHA2.new << (time + key.to_s)
 
-        args = { 'auth' => psk, 'timestamp'=> time, 'version' => '350001', 'user' => user}
-        doc = callApiMethod(action,args);
+  def initialize(host, user, psw)
+    uri = URI.parse(host)
+    @host = uri.host
+    @path = uri.path
+    @user = user
+    @psw = psw
+    @token = nil
+    @token = getAuthToken(user, psw)
+  end
+
+  attr_accessor :host, :path, :user, :psw, :token, :playlist
+
+  # tryies to obtain an auth token
+  def getAuthToken(user, psw)
+    begin
+      action= "handshake"
+      # auth string
+      key = Digest::SHA2.new << psw
+      time = Time.now.to_i.to_s
+      psk = Digest::SHA2.new << (time + key.to_s)
 
-        return doc.at("auth").content
+      args = {'auth' => psk, 'timestamp'=> time, 'version' => '350001', 'user' => user}
+      doc = callApiMethod(action, args);
+
+      return doc.at("auth").content
+    rescue Exception => e 
+      warn ""
+      warn  "token not valid or expired, check your username and password" 
+      warn ""
     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('&')}" 
-        response = Net::HTTP.get_response(host,url )
-        return Nokogiri::XML(response.body)
+  end
+
+  # generic api method call
+  def callApiMethod(method, args={})
+    begin
+      args['auth'] ||= token if token
+      url = path + "/server/xml.server.php?action=#{method}&#{args.keys.collect { |k| "#{k}=#{args[k]}" }.join('&')}"
+      response = Net::HTTP.get_response(host, url)
+      return Nokogiri::XML(response.body)
+    rescue Errno::ECONNREFUSED => e
+      warn "Ampache closed with the following error"
+      warn e.message
+      exit
     end
+  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 
-        artists = []
-        doc = callApiMethod("artists",args)
-        doc.xpath("//artist").each do |a|
-            artists << AmpacheArtist.new(self,a['id'] ,a.at("name").content)
-        end
-        return artists
+  # retrive artists lists from database,
+  # name is an optional filter
+  def artists(name = nil)
+    args = {}
+    args = {'filter' => name.to_s} if name # artist search
+    artists = []
+    doc = callApiMethod("artists", args)
+    doc.xpath("//artist").each do |a|
+      artists << AmpacheArtist.new(self, a['id'], a.at("name").content)
     end
+    return artists
+  end
 
-    def albums(artist)
-        albums = []
-        args = { 'filter' => artist.uid.to_s }
-        doc = callApiMethod("artist_albums",args)
-        doc.xpath("//album").each do |a|
-            albums  << AmpacheAlbum.new(self,a['id'], a.at("name").content, artist)
-        end
-        return albums
+  def albums(artist)
+    albums = []
+    args = {'filter' => artist.uid.to_s}
+    doc = callApiMethod("artist_albums", args)
+    doc.xpath("//album").each do |a|
+      albums << AmpacheAlbum.new(self, a['id'], a.at("name").content, artist)
     end
+    return albums
+  end
 
-    def songs(album)
-        songs = []
-        args = { 'filter' => album.uid.to_s }
-        doc = callApiMethod("album_songs",args)
-        doc.xpath("//song").each do |s|
-            songs << AmpacheSong.new(self,s['id'], s.at("title").content, album.artist, album, s.at("url").content)
-        end
-        return songs
+  def songs(album)
+    songs = []
+    args = {'filter' => album.uid.to_s}
+    doc = callApiMethod("album_songs", args)
+    doc.xpath("//song").each do |s|
+      songs << AmpacheSong.new(self, s['id'], s.at("title").content, album.artist, album, s.at("url").content)
     end
-    
+    return songs
+  end
+
 end
 

data/lib/lib-classes.rb

@@ -1,185 +1,214 @@
 require 'open4'
 require 'timeout'
 class AmpacheArtist
-    
-    # include play module
-    def initialize(ar,uid,name)
-        @ar = ar
-        @uid = uid
-        @name = name
-    end
 
-    attr_reader :uid, :name
+  # include play module
+  def initialize(ar, uid, name)
+    @ar = ar
+    @uid = uid
+    @name = name
+  end
 
-    def albums
-        @albums ||= @ar.albums(self)
-    end
+  attr_reader :uid, :name
+
+  def albums
+    @albums ||= @ar.albums(self)
+  end
+
+  def add_to_playlist(pl)
+  albums.each do |s|
+    s.add_to_playlist(pl)
+    sleep 1
+  end
+end
 end
 
 
 class AmpacheAlbum
-    
-    def initialize(ar,uid,name,artist)
-        @ar = ar
-        @uid = uid
-        @name = name
-        @artist = artist
-    end
 
-    attr_reader :uid, :name, :artist
+  def initialize(ar, uid, name, artist)
+    @ar = ar
+    @uid = uid
+    @name = name
+    @artist = artist
+  end
 
-    def songs
-        @songs ||= @ar.songs(self)
-    end
+  attr_reader :uid, :name, :artist
 
-    def addToPlaylist(pl)
-        songs.each do |s|
-            s.addToPlaylist(pl)
-        end
+  def songs
+    @songs ||= @ar.songs(self)
+  end
+
+  def add_to_playlist(pl)
+    songs.each do |s|
+      s.add_to_playlist(pl)
     end
+  end
 
 end
 
 class AmpacheSong
 
-    def initialize(ar,uid,title,artist,album, url) 
-        @ar = ar
-        @uid = uid
-        @title = title
-        @artist = artist
-        @album = album
-        @url = url
-    end
+  def initialize(ar, uid, title, artist, album, url)
+    @ar = ar
+    @uid = uid
+    @title = title
+    @artist = artist
+    @album = album
+    @url = url
+  end
 
-    attr_reader :uid, :title, :artist, :album, :url
+  attr_reader :uid, :title, :artist, :album, :url
 
-    def addToPlaylist(pl)
-        pl.add(self)
-    end
+  def add_to_playlist(pl)
+    pl.add(self)
+  end
 
 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($options[:timeout]) do 
-                    until @stdout.gets.inspect =~ /playback/ do
-                    # puts @stdout.gets.inspect
-
-                    end
-
-                end
-            rescue Timeout::Error  
-                puts "err on reading data"
-            end
-        else
-            begin
-                @stdin.puts "loadfile \"#{song.url}\" 1"
-            rescue Errno::EPIPE
-                puts "error on adding song to playlist" 
-                @pid = nil
-                add(song)
-             end
-        end
+class AmpachePlaylist
+
+  def initialize
+    @started = false
+    @list = []
+  end
+
+  attr_reader :list
+
+  def started?
+    @started == true
+  end
+
+  def started!
+    @started = true
+  end
+
+
+  def mplayer_start(song)
+  #puts song.inspect
+    $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)
+    #puts mplayer
+    started!
+    Thread.new do
+      ignored, status = Process::waitpid2 @pid
+      next_song = @list.slice!(0)
+      if next_song && started?
+        mplayer_start(next_song) 
+      else
+        puts "PLAYLIST OVER"
+        @started = false
+        @pid  = nil
+      end
     end
+  end
 
-    def play
-        @player.play if @pid 
+  def console
+    while ((cmd = gets.chomp)  != 'exit' )
+      @stdin.puts cmd
     end
-
-    def stop
-        begin
-            @stdin.puts "quit" if @pid
-        rescue Errno::EPIPE
-            puts "playlist is over" 
-        end
-        @pid = nil
+  end
+
+  def add(song)
+    say(HighLine.new.color("adding song ",:green) + "#{song.title}")
+    if !@pid && !started?
+      mplayer_start(song)
+    else
+      @list << song
     end
-
-    def pause
-        begin
-            @stdin.puts "pause" if @pid
-        rescue Errno::EPIPE
-            puts "playlist is over" 
-        end
+  end
+
+  def stop
+    begin
+      @started = false
+      @list = []
+      @stdin.puts "quit" if @pid
+    rescue Errno::EPIPE
+      puts "playlist is over"
     end
-
-    def next
-        begin
-            @stdin.puts "pt_step 1 1" if @pid
-        rescue Errno::EPIPE => e
-            puts "playlist is over on next" 
-            @pid = nil
-        end
+    @pid = nil
+  end
+
+  def pause
+    begin
+      @stdin.puts "pause" if @pid && started?
+    rescue Errno::EPIPE
+      puts "playlist is over"
+    end
+  end
+
+  def next
+    begin
+      # quit current mplayer instance.. thread will fire up next song!
+      @stdin.puts "quit" if @pid && started?
+    rescue Errno::EPIPE => e
+      puts "playlist is over on next"
+      @pid = nil
     end
-    
-    def nowPlaying
-        return "Not playing man!" unless @pid
-        begin
-            s= ''
-            @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 => e
-            @pid = nil
-            return "playlist is over here" #, or you got an ERROR from mplayer: #{e.to_s}" 
+  end
+
+  def now_playing
+    return "Not playing man!" unless started?  && !@pid.nil?
+    begin
+      s = get("meta_title")
+      return "data not available OR playlist is over"  if s.nil?
+      s+= get("meta_artist") rescue s
+      s+= get("meta_album")  rescue s
+      s.chomp!
+      return s
+
+    rescue Errno::EPIPE => e
+      @pid = nil
+      @started = false
+      return "playlist is over here" #, or you got an ERROR from mplayer: #{e.to_s}"
 
-        end
     end
-    
-    # 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
-      match = case field
-      when "time_pos" then "ANS_TIME_POSITION"
-      when "time_length" then "ANS_LENGTH"
-      when "file_name" then "ANS_FILENAME"
-      else "ANS_#{field.upcase}"
-      end
-      res = command("get_#{value}",/#{match}/)
-      res.gsub("#{match}=","").gsub("'","")
+  end
+
+  # 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
+    match = case field
+    when "time_pos" then
+      "ANS_TIME_POSITION"
+    when "time_length" then
+      "ANS_LENGTH"
+    when "file_name" then
+      "ANS_FILENAME"
+    else
+      "ANS_#{field.upcase}"
     end
-
-    def command(cmd,match = //)
-      @stdin.puts(cmd)
-      response = ""
-      until response =~ match
-        response = @stdout.gets
-#XXX escaping bad utf8 chars
-        ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
-        if response
-          response =ic.iconv(response + ' ')[0..-2] 
-        else
-          response == ''
+    res = command("get_#{value}", /#{match}/)
+    res.gsub("#{match}=", "").gsub("'", "")  unless res.nil?
+  end
+
+  def command(cmd, match = //)
+    @stdin.puts(cmd)
+    response = ""
+    begin
+      t = Timeout::timeout(3) do
+        until response =~ match
+          response = @stdout.gets
+          #puts response
+    #XXX escaping bad utf8 chars
+          ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+          if response
+            response =ic.iconv(response + ' ')[0..-2]
+          else
+            response == ''
+          end
         end
       end
-      response.gsub("\e[A\r\e[K","")
+      return response.gsub("\e[A\r\e[K", "")
+    rescue Timeout::Error
+      return
     end
 
+  end
+
 end
 

metadata

@@ -2,7 +2,7 @@
 name: ruby-ampache
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.1.1
 platform: ruby
 authors: 
 - ghedmat
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-09-26 00:00:00 +02:00
 default_executable: ruby-ampache
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,6 +104,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby ampache command line client
-test_files: 
-- test/helper.rb
-- test/test_ruby-ampache.rb
+test_files: []
+