shroom 0.0.1 → 0.0.3

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.1'
+  s.version = '0.0.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'
@@ -17,14 +17,24 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'shroom'
   s.homepage = 'http://shroom.rubyforge.org'
   s.add_dependency('ruby-mp3info', '>= 0.6.13')
+  s.add_dependency('MP4Info', '>= 0.3.3')
   s.add_dependency('ruby-ogginfo', '>= 0.3.2')
   s.add_dependency('flacinfo-rb', '>= 0.4')
   s.add_dependency('earworm', '>= 0.0.2')
   s.add_dependency('sequel', '>= 3.2.0')
-  s.requirements << 'libgstreamer0.10-ruby'
+  s.add_dependency('wxruby', '>= 2.0.0')
+  s.add_dependency('rbrainz', '>= 0.5.0')
+  s.add_dependency('scrobbler', '>= 0.2.3')
+  s.add_dependency('shared-mime-info', '>= 0.1')
   s.requirements << 'libgnome2-ruby'
   s.requirements << 'libsqlite3-ruby'
   s.requirements << 'libglade2-ruby'
+  # Requirements for icanhasaudio
+  s.requirements << 'ruby-dev'
+  s.requirements << 'libopenssl-ruby'
+  s.requirements << 'libmp3lame-dev'
+  s.requirements << 'libvorbis-dev'
+  s.requirements << 'make'
   s.executables = ['shroom']
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,lib,spec}/**/*")
   s.require_path = "lib"

data/bin/shroom

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
 
+require 'rubygems'
 require 'sh_main.rb'
 Sh::Main.new

data/lib/sh_browse.rb

@@ -20,7 +20,7 @@ module Sh
       end
       @tree.append_column col_artist
 
-      @model = TreeStore.new(Object)
+      @model = TreeStore.new(Object, Array)
       @tree.model = @model
 
       GLib::Timeout.add(1000) do
@@ -79,7 +79,19 @@ module Sh
             queue << iter[0]
             iter.next!
           end
+          prev = []
+          iter = parent.first_child
+          until iter.path.indices == path.indices
+            prev << iter[0]
+            iter.next!
+          end
+          queue.insert 0, *prev
           view.queue = queue
+          view.queue_pos = prev.size
+          view.play
+        else
+          view.stop
+          view.queue = iter[1].dup
           view.play
         end
       end
@@ -98,20 +110,21 @@ module Sh
           artist_node[0] = artist
           # Required for proper handling of multiple artists with on album
           album_node = nil
-          #artist_node[1] = []
         end
-        #artist_node[1] << song
+        artist_node[1] ||= []
+        artist_node[1] << song
         
         album = song.album || '!Unknown Album!'
         if not album_node or album_node[0] != album
           album_node = @model.append artist_node
           album_node[0] = album
-          #album_node[1] = []
         end
-        #album_node[1] << song
+        album_node[1] ||= []
+        album_node[1] << song
 
         track_node = @model.append album_node
         track_node[0] = song
+        track_node[1] = [song]
       end
     end
 

data/lib/sh_main.rb

@@ -16,7 +16,9 @@ module Sh
   class Main
     def initialize
       $db = Sh::Database.new
-      Sh::View.new.show
+      Wx::App.run do
+        Sh::View.new.show
+      end
       puts 'Saving preferences...'
       Sh::Global.save_prefs
       puts 'Bye!'

data/lib/sh_player.rb

@@ -1,164 +1,215 @@
-require 'gst'
+require 'wx'
 require 'rubygems'
 require 'scrobbler'
 
 module Sh
-  class Player
+  class Player < Wx::Frame
     @@scrobble_auth = nil
-    
-    Gst.init
-
     attr_reader :song
 
     def initialize song
       @song = song
-      @stopped = false
+      @destroyed = false
       @play_time = 0
-
-      init
-    end
-
-    private
-    def init
-      # setup the playbin
-	    @playbin = Gst::ElementFactory.make('playbin')
-	    @playbin.uri = "file://#{@song.path}"
-	    @playbin.ready
-
-      # Get duration
-      # FIXME: This duration-getting code results in nasty error messages
-      @playbin.audio_sink = Gst::ElementFactory.make('fakesink')
-      @playbin.play
-      pos = -1
-      while true
-        while (Gtk.events_pending?)
-          Gtk.main_iteration
-        end
-        query = Gst::QueryPosition.new(Gst::Format::TIME)
-        @playbin.query(query)
-        new_pos = query.parse.last / 1000000000.to_f
-        break if pos > 0 and new_pos == pos
-        pos = new_pos
-      end
-      query = Gst::QueryDuration.new(Gst::Format::TIME)
-      @playbin.query(query)
-      @duration = query.parse.last / 1000000000.to_f
-      @playbin.stop
-	
-	    # setup the sink
-	    @playbin.audio_sink = Gst::ElementFactory.make('autoaudiosink')
-
-      @playbin.bus.add_watch do |a, message|
-        case message.type
-        when Gst::Message::Type::ERROR
-          puts "An error occured: #{message.parse_error[0]}"
-        when Gst::Message::Type::EOS
-          pause
-          seek 0
-          @finished_cb.call self if @finished_cb
-        end
-        true
-      end
-
-      #@duration = @song.duration if @duration <= 0
-
-      # Make sure pipeline is stopped when program is exited
-      Signal.trap('EXIT') do
-        stop
+      super(nil,:title=>"",:size=>[700,700])
+      @mp = MediaPanel.new(self)
+      @mp.do_load_file song.path
+      self.hide
+      trap('EXIT') do
+        self.stop
       end
-
       GLib::Timeout.add(1000) do
         @play_time += 1 if playing?
-        not @stopped
+        !@destroyed
       end
     end
 
-    public
+    def demolish
+      @destroyed = true
+      self.destroy
+    end
+
     def play
-      @stopped = false
-      @playbin.play
+      @paused = false
+      @playing = true
+      @mp.play
     end
 
     def pause
-      @playbin.pause
+      @paused = true
+      @playing = false
+      @mp.pause
+    end
+
+    def playing?
+      @playing
+    end
+
+    def paused?
+      @paused
     end
 
     def stop
-      @stopped = true
-      @playbin.stop
-      scrobble! if $prefs[:lastfm]
+      @mp.stop
+      scrobble_lastfm! if $prefs[:lastfm]
+    end
+
+    def duration
+      @mp.duration
     end
 
-    def scrobble!
+    def position
+      @mp.position
+    end
+
+    # Set the position (in seconds) to start playback from
+    def seek pos
+      @mp.seek pos
+    end
+
+    def on_finished &block
+      @mp.on_finished {block.call(self)}
+    end
+
+    #TODO: move scrobble support elsewhere
+    def scrobble_lastfm!
+      @@scrobble_queue ||= []
       play_time = @play_time
       if play_time > 240 or (play_time > duration / 2 and duration > 30)
         auth = @@scrobble_auth
-        if not auth
+        if not auth or auth.status.strip.upcase != 'OK'
           user, pass = $prefs[:lastfm_user], $prefs[:lastfm_password]
-          auth = @@scrobble_auth = Scrobbler::SimpleAuth.new(:user => user, :password => pass)
-          auth.handshake!
-          puts "Auth Status: #{auth.status}"
+          begin
+            auth = @@scrobble_auth = Scrobbler::SimpleAuth.new(:user => user, :password => pass)
+            auth.handshake!
+            puts "Last.fm authentication status: #{auth.status}"
+          rescue
+          end
         end
 
-        Thread.new do
-          scrobble = Scrobbler::Scrobble.new(
-            :session_id => auth.session_id,
-            :submission_url => auth.submission_url,
-            :artist => song.artist,
-            :track => song.title,
-            :album => song.album,
-            :time => Time.new,
-            :length => play_time,
-            :track_number => song.track_num)
+        @@scrobble_queue << Scrobbler::Scrobble.new(
+          :session_id => auth.session_id,
+          :submission_url => auth.submission_url,
+          :artist => song.artist,
+          :track => song.title,
+          :album => song.album,
+          :time => Time.new,
+          :length => duration,
+          :track_number => song.track_num)
 
-          begin
-            scrobble.submit!
-            puts "Scrobbler Submission Status: #{scrobble.status}"
-            #user = Scrobbler::User.new($prefs[:lastfm_user])
-            #user.recent_tracks.each { |t| puts t.name }
-          rescue
-            puts "Scrobble oopsie"
+        # No point attempting to scrobble without authentication
+        return if auth.status.strip.upcase != 'OK'
+
+        Thread.new do
+          failed_scrobbles = []
+          until @@scrobble_queue.empty?
+            scrobble = @@scrobble_queue.pop
+            scrobble.submit! rescue Exception
+
+            if scrobble.status.strip.upcase == 'OK'
+              puts "Scrobble for '#{scrobble.track}' succeeded"
+            else
+              puts "Warning: Scrobble for '#{scrobble.track}' failed"
+              failed_scrobbles << scrobble
+            end
           end
+          @@scrobble_queue.insert(0, *failed_scrobbles)
         end
       end
     end
+  end
 
-    def duration
-      @duration
+  private
+  class MediaPanel < Wx::Panel
+    def initialize(parent)
+      super(parent)
+
+      # The actual media player control
+      @mc = Wx::MediaCtrl.new(self)
+
+      evt_media_loaded @mc, :on_media_loaded
+      evt_media_finished @mc, :on_media_finished
     end
 
-    def playing?
-      @playbin and @playbin.get_state.include? Gst::STATE_PLAYING
+    # Update the position indicator in seconds
+    def position
+      offset = @mc.tell
+      # Will be -1 if nothing is loaded
+      if offset >= 0
+        offset_secs = offset / 1000
+        return offset_secs
+        #lbl_pos = "%i:%02d" % [ offset_secs / 60, offset_secs % 60 ]
+      end
+      return nil
     end
 
-    def paused?
-      @playbin and @playbin.get_state.include? Gst::STATE_PAUSED
+    # Actually load a file into the mediactrl
+    def do_load_file(path)
+      unless @mc.load(path)
+        Wx::message_box("Unable to load file", "ERROR",
+          Wx::ICON_ERROR|Wx::OK)
+        on_media_finished nil
+      end
     end
 
-    # Get the position (in seconds) that playback is up to
-    def position
-      if not playing? and not paused?
-        return 0
-      else
-        query = Gst::QueryPosition.new(Gst::Format::TIME)
-        @playbin.query(query)
-        pos = query.parse.last
-        if pos < 0
-          return duration
-        else
-          return pos / 1000000000.to_f
-        end
+    MEDIA_FILE_WILDCARD = "Audio Files|*.mp3;*.flac;*.ogg;*.m4a"
+    # Load a media file from disk
+    def show_open_dialog
+      dlg = Wx::FileDialog.new( self,
+        :message  => "Choose a media file",
+        :wildcard => MEDIA_FILE_WILDCARD,
+        :style    => Wx::OPEN)
+      if dlg.show_modal == Wx::ID_OK
+        do_load_file(dlg.path)
       end
     end
 
-    # Set the position (in seconds) to start playback from
-    def seek pos
-      @playbin.seek 1.0, Gst::Format::TIME, Gst::SeekFlags::FLUSH, Gst::SeekType::SET,
-        pos * 1000000000, Gst::SeekType::NONE, -1
+    # Move the media to a position in the file, using the slider
+    def seek(secs)
+      @mc.seek((secs*1000).to_i)
+    end
+
+    # Set up the initial size for the move
+    def on_media_loaded(evt)
+      @loaded = true
+
+      # Update the length and position text indicators with the media's
+      # time length, shown as minutes and seconds
+      len_secs = duration
+      lbl_len = "%i:%02d" % [ len_secs / 60, len_secs % 60 ]
     end
 
     def on_finished &block
       @finished_cb = block
     end
+
+    private
+    def on_media_finished(evt)
+      @finished_cb.call if @finished_cb
+    end
+    
+    public
+    def duration
+      return @mc.length / 1000
+    end
+
+    # Stop the playback
+    def stop
+      @mc.stop
+    end
+
+    # Pause the playback
+    def pause
+      @mc.pause
+    end
+
+    # Start the playback
+    def play
+      if not @mc.play
+        Wx::MessageBox("unable to play media","ERROR",Wx::ICON_ERROR|Wx::OK)
+        on_media_finished nil
+      else
+      end
+    end
   end
 end

data/lib/sh_song.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
-require 'mp3info'
-require 'flacinfo'
-require 'ogginfo'
+require 'sh_tagreader'
 require 'earworm'
 require 'rbrainz'
 include MusicBrainz
@@ -13,25 +11,10 @@ module Sh
 
     def initialize path
       @path = File.expand_path path
-      ext = File.extname path
-      @mime = {
-        '.mp3' => 'audio/mpeg',
-        '.flac' => 'audio/flac',
-        '.ogg' => 'audio/ogg'
-      }[ext]
     end
 
     def duration
-      if not @duration
-        case
-        when 'audio/mpeg'
-          Mp3Info.open(@path) {|mp3| @duration = mp3.length}
-        when 'audio/flac'
-        when 'audio/ogg'
-        end
-      end
-
-      return @duration
+      @duration ||= Sh::TagReader.read(path)[:duration]
     end
 
 
@@ -80,65 +63,22 @@ module Sh
     end
 
     public
-    def read_tags!
-      case @mime
-      when 'audio/mpeg'
-        read_tags_mp3!
-      when 'audio/flac'
-        read_tags_flac!
-      when 'audio/ogg'
-        read_tags_ogg!
-      end
-    end
-
-    private
-    def read_tags_mp3!
-      Mp3Info.open path do |mp3|
-        t = mp3.tag
-        @title = t.title unless t.title and t.title.is_binary_data?
-        @artist = t.artist unless t.artist and t.artist.is_binary_data?
-        @album = t.album unless t.album and t.album.is_binary_data?
-        @year = t.year
-        @track_num = t.tracknum
-        @duration = mp3.length
-      end
-    end
-
-    def read_tags_ogg!
-      OggInfo.open path do |ogg|
-        t = ogg.tag
-        @title = t.title unless t.title and t.title.is_binary_data?
-        @artist = t.artist unless t.artist and t.artist.is_binary_data?
-        @album = t.album unless t.album and t.album.is_binary_data?
-        #TODO: handle alternative date formats, like yyyy/mm/dd
-        @year = t.date.split('-').first.to_i
-        @track_num = t.tracknumber.to_i
-        @duration = ogg.length
-      end rescue Exception
-      self
-    end
-
-    def read_tags_flac!
-      flac = FlacInfo.new(path)
-      comments = flac.comment
-      t = {}
-      comments.each do |comment|
-        split = comment.split('=')
-        key = split.first.downcase
-        value = (split[1..-1]).join
-        value = nil if value == '' or value.is_binary_data?
-        case key
-        when 'title'
-          @title = value
-        when 'artist'
-          @artist = value
-        when 'album'
-          @album = value
-        when 'year'
-          #TODO: handle alternative date formats, like yyyy/mm/dd
-          @year = value.split('-').first.to_i
-        when 'tracknumber'
-          @track_num = value.to_i
+    def read_tags! overwrite=false
+      Sh::TagReader.read(path) do |data|
+        if overwrite
+          @title = data[:title]
+          @artist = data[:artist]
+          @album = data[:album]
+          @year = data[:year]
+          @track_num = data[:track_num]
+          @duration = data[:duration]
+        else
+          @title ||= data[:title]
+          @artist ||= data[:artist]
+          @album ||= data[:album]
+          @year ||= data[:year]
+          @track_num ||= data[:track_num]
+          @duration ||= data[:duration]
         end
       end
     end

data/lib/sh_tagreader.rb

@@ -0,0 +1,161 @@
+module Sh
+  class TagReader
+    def TagReader.read path, &block
+      @path = File.expand_path path
+      metadata = {}
+      
+      if try_require 'shared-mime-info'
+        type = MIME.check(path)
+        @mime = type.to_s if type.media == 'audio'
+      end
+      @mime ||= {
+        '.mp3' => 'audio/mpeg',
+        '.m4a' => 'audio/mp4',
+        '.flac' => 'audio/x-flac',
+        '.ogg' => 'audio/ogg',
+        '.wav' => 'audio/x-wav',
+        '.wma' => 'audio/x-ms-wma'
+      }[File.extname path]
+
+      case @mime
+      when 'audio/mpeg'
+        metadata = TagReader.read_mp3 path
+      when 'audio/mp4'
+        metadata = TagReader.read_m4a path
+      when 'audio/ogg'
+        metadata = TagReader.read_ogg path
+      when 'audio/x-flac'
+        metadata = TagReader.read_flac path
+      when 'audio/x-ms-wma'
+        metadata = TagReader.read_wma path
+      when 'audio/x-wav'
+        metadata = TagReader.read_wave path
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_mp3 path, &block
+      metadata = {}
+      if try_require 'mp3info'
+        Mp3Info.open path do |mp3|
+          t = mp3.tag
+          metadata[:title] = t.title unless t.title and t.title.is_binary_data?
+          metadata[:artist] = t.artist unless t.artist and t.artist.is_binary_data?
+          metadata[:album] = t.album unless t.album and t.album.is_binary_data?
+          metadata[:year] = t.year.to_i
+          metadata[:track_num] = t.tracknum.to_i
+          metadata[:duration] = mp3.length
+        end
+      else
+        puts 'Please install the "mp3info" gem in order to read MP3 info'
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_m4a path, &block
+      metadata = {}
+      if try_require 'mp4info'
+        mp4 = MP4Info.open path
+        metadata[:title] = mp4.NAM unless mp4.NAM and mp4.NAM.is_binary_data?
+        metadata[:artist] = mp4.ART unless mp4.ART and mp4.ART.is_binary_data?
+        metadata[:album] = mp4.ALB unless mp4.ALB and mp4.ALB.is_binary_data?
+        metadata[:year] = mp4.DAY.to_i
+        metadata[:track_num] = mp4.TRKN.first.to_i
+        metadata[:duration] = mp4.SECS
+      else
+        puts 'Please install the "mp4info" gem in order to read M4A info'
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_ogg path, &block
+      metadata = {}
+      if try_require 'ogginfo'
+        OggInfo.open path do |ogg|
+          t = ogg.tag
+          metadata[:title] = t.title unless t.title and t.title.is_binary_data?
+          metadata[:artist] = t.artist unless t.artist and t.artist.is_binary_data?
+          metadata[:album] = t.album unless t.album and t.album.is_binary_data?
+          metadata[:year] = t.date.to_i
+          metadata[:track_num] = t.tracknumber.to_i
+          metadata[:duration] = ogg.length
+        end rescue Exception
+      else
+        puts 'Please install the "ogginfo" gem in order to read OGG info'
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_flac path, &block
+      metadata = {}
+      if try_require 'flacinfo'
+        flac = FlacInfo.new(path)
+        flac.comment.each do |comment|
+          split = comment.split('=')
+          key = split.first.downcase
+          value = (split[1..-1]).join
+          value = nil if value == '' or value.is_binary_data?
+          case key
+          when 'title'
+            metadata[:title] = value
+          when 'artist'
+            metadata[:artist] = value
+          when 'album'
+            metadata[:album] = value
+          when 'year'
+            metadata[:year] = value.to_i
+          when 'tracknumber'
+            metadata[:track_num] = value.to_i
+          end
+        end
+      else
+        puts 'Please install the "flacinfo" gem in order to read FLAC info'
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_wma path, &block
+      metadata = {}
+      if try_require 'wmainfo'
+        wma = WmaInfo.new(path)
+        wma.tags.each do |key, value|
+          key = key.downcase
+          case key
+          when 'title'
+            metadata[:title] = value
+          when 'author'
+            metadata[:artist] = value
+          when 'albumtitle'
+            metadata[:album] = value
+          when 'year'
+            metadata[:year] = value.to_i
+          when 'tracknumber'
+            metadata[:track_num] = value.to_i
+          end
+        end
+        metadata[:duration] = wma.info["playtime_seconds"]
+      else
+        puts 'Please install the "wmainfo" gem in order to read WMA info'
+      end
+      yield metadata if block
+      return metadata
+    end
+
+    def TagReader.read_wave path, &block
+      metadata = {}
+      if try_require 'waveinfo'
+        wave = WaveInfo.new path
+        metadata[:duration] = wave.duration
+      else
+        puts 'Please install the "waveinfo" gem in order to read WAV info'
+      end
+      yield metadata if block
+      return metadata
+    end
+  end
+end

data/lib/sh_util.rb

@@ -1,14 +1,15 @@
+require 'gtk2'
+
 class Object
   def try_require lib
-    name = lib
-    name << '.rb' unless File.extname(name) == '.rb'
-    found = false
-    $:.each do |d|
-      found = !Dir["#{d}/#{name}"].empty?
-      break if found
-    end
-    require lib if found
-    found
+    found = nil
+    begin
+      require lib
+      found = true
+    rescue LoadError
+      found = false
+    end
+    return found
   end
 
   def find_in_load_path(file)
@@ -19,3 +20,66 @@ class Object
     return nil
   end
 end
+
+module Kelp
+  class ProgressDialog < Gtk::Dialog
+    def initialize(title)
+      super(title,
+        nil,
+        Dialog::MODAL,
+        [Stock::CANCEL, Dialog::RESPONSE_NONE])
+      @lbl_message = Label.new("Please wait")
+      vbox.pack_start @lbl_message, false, false, 8
+      @progress = ProgressBar.new
+      vbox.pack_start @progress, false, false, 8
+      self.width_request = 300
+      vbox.show_all
+    end
+
+    def message=(msg)
+      @lbl_message.set_markup(msg)
+    end
+
+    def message
+      @lbl_message.text
+    end
+
+    def fraction=(frac)
+      @progress.fraction = frac
+    end
+
+    def fraction
+      @progress.fraction
+    end
+
+    def pulse
+      @progress.pulse
+    end
+  end
+
+  class ImageDialog < Gtk::Dialog
+    def initialize(pixbuf, title="")
+      super(title,
+        nil,
+        nil,
+        [Stock::CANCEL, Dialog::RESPONSE_NONE])
+      @image = Image.new(pixbuf)
+      vbox.pack_start @image, true, true, 8
+      if pixbuf
+      self.width_request = pixbuf.width + 16
+      self.height_request = size[1] + pixbuf.height + 16
+      end
+      vbox.show_all
+      signal_connect('response') { destroy }
+    end
+
+    def pixbuf=(pixbuf)
+      @image.pixbuf = pixbuf
+    end
+  end
+
+  def Kelp.process_events
+    Gtk.main_iteration while Gtk.events_pending?
+  end
+end
+

data/lib/sh_view.rb

@@ -23,53 +23,39 @@ module Sh
 
       @glade= GladeXML.new(Global.locate('shroom.glade'))
 
-      cancelled = false
-      dialog = Dialog.new("Adding songs to database",
-        nil,
-        Dialog::MODAL,
-        [Stock::CANCEL, Dialog::RESPONSE_NONE])
-      dialog.signal_connect('response') { cancelled = true; dialog.destroy }
-      progress = ProgressBar.new
-      dialog.vbox.pack_start Label.new('Adding songs to database'), false, false, 8
-      lbl_path = Label.new
-      dialog.vbox.pack_start lbl_path, false, false, 0
-      dialog.vbox.pack_start progress, false, false, 8
-      dialog.width_request = 300
-      
-      new_songs = []
-      Dir[$prefs[:library_dir]+'/**/*'].each do |path|
-        ext = File.extname path
-        if [".mp3", ".ogg", ".flac"].include? ext
-          new_songs << Song.new(path) unless $db.contains? path
+      if File.exists? $prefs[:library_dir]
+        cancelled = false
+        dialog = Kelp::ProgressDialog.new("Updating database...")
+        dialog.signal_connect('response') { cancelled = true}
+        new_songs = []
+        Dir[$prefs[:library_dir]+'/**/*'].each do |path|
+          ext = File.extname path
+          if ['.mp3', '.m4a', '.ogg', '.flac'].include? ext
+            new_songs << Song.new(path) unless $db.contains? path
+          end
         end
-      end
-      if new_songs.length > 0
-        dialog.show_all
-        while (Gtk.events_pending?)
-          Gtk.main_iteration
+        if new_songs.length > 0
+          dialog.show_all
+          Kelp.process_events
         end
-      end
-      inc = 1 / new_songs.length.to_f
-      new_songs.each do |song|
-        lbl_path.text = "..." + song.path[-30..-1]
-        puts "Adding: #{song.path}"
-        song.read_tags!
-        $db.save_song song
-        progress.fraction += inc
-        while (Gtk.events_pending?)
-          Gtk.main_iteration
+        inc = 1 / new_songs.length.to_f
+        new_songs.each do |song|
+          dialog.message = "..." + song.path[-30..-1]
+          puts "Adding: #{song.path}"
+          song.read_tags!
+          $db.save_song song
+          dialog.fraction += inc
+          Kelp.process_events
+          break if cancelled
         end
-        break if cancelled
-      end
-      progress.pulse unless cancelled
-      $db.clean
-      dialog.destroy unless cancelled
+        dialog.message = "Cleaning out old entries..."
+        dialog.pulse
+        $db.clean
+        dialog.destroy
 
-      # Clean up
-      new_songs = nil
-      dialog = nil
-      progress = nil
-      lbl_path = nil
+        # Clean up
+        new_songs = dialog = nil
+      end
 
       icon = Gdk::Pixbuf.new Global.locate('icon_16x16.png')
 
@@ -130,7 +116,7 @@ module Sh
       end
       GLib::Timeout.add(100) do
         if @player
-          pos = @player.position
+          pos = @player.position.to_f
           seeker.value = pos / @player.duration
           lbl_time.text = time_to_s(pos) + "/" + time_to_s(@player.duration)
           lbl_song.set_markup @player.song.to_html
@@ -209,8 +195,13 @@ module Sh
       sidebar.pack_start lst_tabs, true, true, 0
       # Cover image widget
       @img_cover = Image.new
+      event_box = EventBox.new
+      event_box.add @img_cover
+      event_box.signal_connect("button-press-event") do |w, event|
+        Kelp::ImageDialog.new(@pixbuf, @player.song.album).show if @pixbuf and @player
+      end
       @img_cover.height_request = 150
-      sidebar.pack_start @img_cover, false, false, 0
+      sidebar.pack_start event_box, false, false, 0
       # Lyrics text view
       @txt_lyrics = TextView.new
       @txt_lyrics.editable = false
@@ -261,7 +252,6 @@ module Sh
     end
 
     def show_preferences
-      #FIXME: disable close button on dialog
       dlg_prefs = @glade.get_widget("dlg_preferences")
       dlg_prefs.signal_connect('delete-event') do
         dlg_prefs.hide
@@ -304,11 +294,12 @@ module Sh
         "Copyright (C) 2009 Aiden Nibali",
         "Shroom - A music player and organizer in Ruby",
         ["Aiden Nibali"], ["Aiden Nibali"], nil)
-      dlg_about.logo = Gdk::Pixbuf.new(Global.locate('icon_16x16.png'))
+      dlg_about.logo = Gdk::Pixbuf.new(Global.locate('icon_128x128.png'))
       dlg_about.show
     end
 
     def prepare_song
+      @player.demolish if @player
       @player = Sh::Player.new @queue[@queue_pos]
       @player.on_finished do |player|
         if player == @player
@@ -329,7 +320,7 @@ module Sh
 
     # Format time (in seconds) as mins:secs
     def time_to_s(time)
-      mins_float = time / 60
+      mins_float = time.to_f / 60
       mins = mins_float.floor
       secs = ((mins_float - mins) * 60).round
       if secs == 60
@@ -406,6 +397,12 @@ module Sh
       prepare_song
     end
 
+    def queue_pos=(pos)
+      puts pos
+      @queue_pos = pos
+      prepare_song
+    end
+
     def play
       stop
       if @player

data/lib/shroom-res/icon.svg

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="icon.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/aiden/data/Projects/Ruby/shroom/lib/shroom-res/icon.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3185">
+      <stop
+         style="stop-color:#d81010;stop-opacity:1;"
+         offset="0"
+         id="stop3187" />
+      <stop
+         style="stop-color:#f79393;stop-opacity:1;"
+         offset="1"
+         id="stop3189" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3173">
+      <stop
+         style="stop-color:#ddd990;stop-opacity:1;"
+         offset="0"
+         id="stop3175" />
+      <stop
+         id="stop3183"
+         offset="1"
+         style="stop-color:#fafaef;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3181"
+       x1="67.09375"
+       y1="71.425606"
+       x2="72.102676"
+       y2="70.175606"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3191"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3206"
+       gradientUnits="userSpaceOnUse"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3208"
+       gradientUnits="userSpaceOnUse"
+       x1="67.09375"
+       y1="71.425606"
+       x2="72.102676"
+       y2="70.175606" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3214"
+       gradientUnits="userSpaceOnUse"
+       x1="67.09375"
+       y1="71.425606"
+       x2="72.102676"
+       y2="70.175606"
+       gradientTransform="matrix(7.6863997,0,0,7.6863997,-464.30109,-449.66077)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531"
+       gradientTransform="matrix(7.6863997,0,0,7.6863997,-464.30109,-449.66077)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.6863997,0,0,7.6863997,-464.30109,-449.66077)"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3226"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.6863997,0,0,7.6863997,-464.30109,-449.66077)"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="linearGradient3231"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.6863997,0,0,7.6863997,-464.30109,-449.66077)"
+       x1="66.030533"
+       y1="64.673965"
+       x2="71.879753"
+       y2="59.227531" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-129.05856"
+     inkscape:cy="95.506274"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="952"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:url(#linearGradient3217);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 6.4908916,57.916122 C 24.999535,58.794024 105.77402,59.044478 121.78689,59.288698 C 131.51788,59.437115 111.17279,6.7059531 62.766321,7.1309803 C 14.358045,7.5560228 -3.430298,57.445546 6.4908916,57.916122 z"
+       id="path2396"
+       sodipodi:nodetypes="cszs" />
+    <path
+       style="fill:url(#linearGradient3214);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 43.24149,58.60241 L 43.48169,116.01021 C 43.542721,130.59666 82.73358,126.90661 82.634289,115.28961 L 82.153889,59.08281 C 68.137693,58.983433 57.427602,58.761526 43.24149,58.60241 z"
+       id="path2398"
+       sodipodi:nodetypes="csscc" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 103.71875 43.1875 C 102.26956 43.207151 100.91692 43.48529 99.90625 44.125 C 96.197739 46.47232 90.335985 54.343794 94.59375 57.75 C 95.129767 58.178813 95.873561 58.630912 96.75 59.0625 C 96.759442 59.062566 96.771811 59.062434 96.78125 59.0625 C 106.76936 59.132599 114.2276 59.191346 119 59.25 C 119.07587 59.134452 119.1521 59.029367 119.21875 58.90625 C 121.57537 54.552957 114.73828 47.432683 110.5 44.875 C 108.79319 43.844986 106.13406 43.154748 103.71875 43.1875 z "
+       id="path3224" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 34.75 13.8125 C 24.029081 19.257975 16.113724 27.276003 11 35 C 14.127645 39.028665 19.127459 42.369797 23.09375 42.65625 C 31.784744 43.28393 46.237628 33.649945 46.09375 24.9375 C 46.017229 20.303889 40.3162 15.899514 34.75 13.8125 z "
+       id="path3229" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 80.65625 19.03125 C 77.997773 19.118855 75.15174 19.743968 72.34375 21 C 69.295722 22.363411 63.410697 24.286122 63.375 27.625 C 63.305604 34.116491 74.008211 40.874321 80.5 40.84375 C 85.404748 40.82066 92.327441 35.517104 93.34375 30.71875 C 94.89759 23.382506 88.631682 18.768434 80.65625 19.03125 z "
+       id="path3219" />
+  </g>
+</svg>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-18 00:00:00 +10:00
+date: 2009-07-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.13
     version: 
+- !ruby/object:Gem::Dependency 
+  name: MP4Info
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-ogginfo
   type: :runtime
@@ -62,6 +72,46 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: wxruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbrainz
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: scrobbler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shared-mime-info
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+    version: 
 description: Shroom is a music player and organizer
 email: dismal.denizen@gmail.com
 executables: 
@@ -81,17 +131,19 @@ files:
 - lib/sh_main.rb
 - lib/sh_song.rb
 - lib/sh_cover_art.rb
+- lib/sh_tagreader.rb
 - lib/sh_lyrics.rb
 - lib/sh_database.rb
 - lib/sh_util.rb
+- lib/shroom-res
 - lib/shroom-res/icon_16x16.png
+- lib/shroom-res/icon.svg
+- lib/shroom-res/icon_128x128.png
 - lib/shroom-res/shroom.glade
 - lib/sh_player.rb
 - lib/sh_view.rb
 has_rdoc: true
 homepage: http://shroom.rubyforge.org
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -110,14 +162,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- libgstreamer0.10-ruby
 - libgnome2-ruby
 - libsqlite3-ruby
 - libglade2-ruby
+- ruby-dev
+- libopenssl-ruby
+- libmp3lame-dev
+- libvorbis-dev
+- make
 rubyforge_project: shroom
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Shroom is a music player and organizer
 test_files: []