shroom 0.0.5 → 0.0.6

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'
@@ -28,6 +28,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('shared-mime-info', '>= 0.1')
   s.requirements << 'rake'
   s.requirements << 'libgnome2-ruby'
+  s.requirements << 'libgtk-mozembed-ruby'
   s.requirements << 'libsqlite3-ruby'
   s.requirements << 'libglade2-ruby'
   # Requirements for icanhasaudio

data/lib/sh_browse.rb

@@ -33,7 +33,7 @@ module Sh
         # Right-click
         if event.button == 3
           path = @tree.get_path_at_pos(event.x, event.y).first
-          data = @tree.model.get_iter(path)[0]
+          data = @model.get_iter(path)[0]
           selection = @tree.selection
           selected_rows = selection.selected_rows
           clicked_in_selection = false
@@ -58,80 +58,26 @@ module Sh
             pbtn_lookup = MenuItem.new 'Lookup metadata automatically'
             menu.append pbtn_lookup
             pbtn_lookup.signal_connect('activate') do |widget|
-              song.lookup!
-              $db.save_song song
-              @model.clear
-              fill_model
+              if song.lookup!
+                remove_song @model.get_iter(path)
+                $db.save_song song
+                insert_song song
+              end
             end
 
             pbtn_reread_tags = MenuItem.new 'Reread tags'
             menu.append pbtn_reread_tags
             pbtn_reread_tags.signal_connect('activate') do |widget|
+              remove_song @model.get_iter(path)
               song.read_tags!(true)
               $db.save_song song
-              @model.clear
-              fill_model
+              insert_song song
             end
             
             pbtn_properties = ImageMenuItem.new Stock::PROPERTIES
             menu.append pbtn_properties
             pbtn_properties.signal_connect('activate') do |widget|
-              glade = Global::GLADE['dlg_song']
-              dlg_song = glade['dlg_song']
-              txt_title = glade['txt_title']
-              txt_title.text = song.title
-
-              # Artists combo box
-              sto_artists = ListStore.new(String, Artist)
-              cmb_artist = glade['cmb_artist']
-              sel = 0
-              $db.artists.sort_by{|a| (a.name || '')}.each_with_index do |artist, i|
-                iter = sto_artists.append
-                iter[0] = artist.name
-                iter[1] = artist
-                sel = i if song.artist && artist.db_id == song.artist.db_id
-              end
-              cmb_artist.model = sto_artists
-              cmb_artist.active = sel
-
-              # Albums combo box
-              sto_albums = ListStore.new(String, Album)
-              cmb_album = glade['cmb_album']
-              sel = 0
-              $db.albums.sort_by{|a| (a.title || '')}.each_with_index do |album, i|
-                iter = sto_albums.append
-                iter[0] = album.title
-                iter[1] = album
-                sel = i if song.album && album.db_id == song.album.db_id
-              end
-              cmb_album.model = sto_albums
-              cmb_album.active = sel
-
-              glade['chk_image'].sensitive = false
-              glade['fbtn_image'].sensitive = false
-              glade['btn_add_artist'].sensitive = false
-              glade['btn_add_album'].sensitive = false
-
-              dlg_song.signal_connect('delete-event') do
-                dlg_song.hide
-              end
-              btn_ok = glade['btn_ok']
-              ok_handle = btn_ok.signal_connect('clicked') do
-                song.title = txt_title.text
-                song.artist = cmb_artist.active_iter[1]
-                song.album = cmb_album.active_iter[1]
-                $db.save_song song
-                @model.clear
-                fill_model
-                dlg_song.hide
-              end
-              btn_cancel = glade['btn_cancel']
-              close_handle = btn_cancel.signal_connect('clicked') do
-                dlg_song.hide
-              end
-              dlg_song.run
-              btn_ok.signal_handler_disconnect ok_handle
-              btn_cancel.signal_handler_disconnect close_handle
+              show_song_properties_dialog(song)
             end
             
             menu.show_all
@@ -172,6 +118,125 @@ module Sh
       @scroll.add @tree
     end
 
+    def show_song_properties_dialog song
+      glade = Global::GLADE['dlg_song']
+      dlg_song = glade['dlg_song']
+      txt_title = glade['txt_title']
+      txt_title.text = song.title
+
+      # Artists combo box
+      sto_artists = ListStore.new(String, Artist)
+      cmb_artist = glade['cmb_artist']
+      sel = 0
+      $db.artists.sort_by{|a| (a.name || '')}.each_with_index do |artist, i|
+        iter = sto_artists.append
+        iter[0] = artist.name
+        iter[1] = artist
+        sel = i if song.artist && artist.db_id == song.artist.db_id
+      end
+      cmb_artist.model = sto_artists
+      cmb_artist.active = sel
+
+      # Albums combo box
+      sto_albums = ListStore.new(String, Album)
+      cmb_album = glade['cmb_album']
+      sel = 0
+      $db.albums.sort_by{|a| (a.title || '')}.each_with_index do |album, i|
+        iter = sto_albums.append
+        iter[0] = album.title
+        iter[1] = album
+        sel = i if song.album && album.db_id == song.album.db_id
+      end
+      cmb_album.model = sto_albums
+      cmb_album.active = sel
+
+      glade['chk_image'].sensitive = false
+      glade['fbtn_image'].sensitive = false
+      glade['btn_add_artist'].sensitive = false
+      glade['btn_add_album'].sensitive = false
+
+      dlg_song.signal_connect('delete-event') do
+        dlg_song.hide
+      end
+      btn_ok = glade['btn_ok']
+      ok_handle = btn_ok.signal_connect('clicked') do
+        song.title = txt_title.text
+        song.artist = cmb_artist.active_iter[1]
+        song.album = cmb_album.active_iter[1]
+        remove_song song
+        $db.save_song song
+        insert_song song
+        dlg_song.hide
+      end
+      btn_cancel = glade['btn_cancel']
+      close_handle = btn_cancel.signal_connect('clicked') do
+        dlg_song.hide
+      end
+      dlg_song.run
+      btn_ok.signal_handler_disconnect ok_handle
+      btn_cancel.signal_handler_disconnect close_handle
+    end
+
+    def remove_song song
+      song_node = nil
+      if song.is_a? TreeIter
+        song_node = song
+      else
+        @model.each do |model, path, iter|
+          if iter[0] == song
+            song_node = iter
+          end
+        end
+      end
+      
+      if song_node
+        album_node = song_node.parent
+        artist_node = album_node.parent
+        @model.remove song_node
+        album_node[1].delete song
+        @model.remove album_node unless album_node.has_child?
+        artist_node[1].delete song
+        @model.remove artist_node unless artist_node.has_child?
+      end
+    end
+
+    def insert_song song
+      artist_node = album_node = prev_song_node = nil
+      @model.each do |model, path, iter|
+        data = iter[0]
+
+        if data.is_a? Artist
+          artist_node = iter if data.db_id == song.artist.db_id
+        elsif artist_node and data.is_a? Album
+          album_node = iter if iter.parent == artist_node and data.db_id == song.album.db_id
+        end
+
+        if album_node and iter.parent == album_node and data.is_a? Song
+          if data.track_num < song.track_num
+            prev_song_node = iter
+          end
+        end
+      end
+      # Artist node
+      unless artist_node
+        artist_node = @model.append nil
+        artist_node[0] = song.artist
+        artist_node[1] = []
+      end
+      artist_node[1] << song
+      # Album node
+      unless album_node
+        album_node = @model.append artist_node
+        album_node[0] = song.album
+        album_node[1] = []
+      end
+      album_node[1] << song
+      # Song node
+      song_node = @model.insert_after(album_node, prev_song_node)
+      song_node[0] = song
+      song_node[1] = [song]
+    end
+
     def fill_model
       artist_node = album_node = track_node = nil
       $db.songs.sort_by {|a| (a.to_s || '')}.each do |song|
@@ -196,6 +261,8 @@ module Sh
         track_node = @model.append album_node
         track_node[0] = song
         track_node[1] = [song]
+
+        Kelp.process_events
       end
     end
 

data/lib/sh_lyrics.rb

@@ -1,5 +1,5 @@
 require 'open-uri'
-require 'rexml/document'
+require 'hpricot'
 require 'cgi'
 
 module Sh
@@ -15,8 +15,15 @@ module Sh
         url = "http://lyricwiki.org/api.php?func=getSong&fmt=xml" +
           "&artist=#{CGI.escape(artist)}" +
           "&song=#{CGI.escape(title)}"
-        doc = REXML::Document.new(open(url).read)
-        REXML::XPath.first(doc, '//lyrics').text
+        doc = Hpricot(open(url))
+        page_url = (doc/'url').inner_text
+        lyrics = nil
+        unless page_url.end_with? ';action=edit'
+          doc = Hpricot(open(page_url).read.gsub(/<[\s]*br[\s]*\/?>/, "\n"))
+          #TODO: Choose most appropriate lyricbox, not just the first
+          lyrics = (doc/'.lyricbox').first.inner_text.strip
+        end
+        return lyrics
       end
     end
   end

data/lib/sh_mmkeys.rb

@@ -5,21 +5,21 @@ module Sh
       @supported = try_require('rubygems') and try_require('rbus')
 
       if supported?
-        bus = RBus.session_bus
-
         begin
-          @mmkeys = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
-          @mmkeys.interface!('org.gnome.SettingsDaemon.MediaKeys')
-          @mmkeys.GrabMediaPlayerKeys('Shroom', 0)
-        rescue
+          bus = RBus.session_bus
+
           begin
             @mmkeys = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
             @mmkeys.interface!('org.gnome.SettingsDaemon.MediaKeys')
             @mmkeys.GrabMediaPlayerKeys('Shroom', 0)
           rescue
-            # MediaKeys are not supported after all
-            @supported = false
+            @mmkeys = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
+            @mmkeys.interface!('org.gnome.SettingsDaemon.MediaKeys')
+            @mmkeys.GrabMediaPlayerKeys('Shroom', 0)
           end
+        rescue
+          # MediaKeys are not supported after all
+          @supported = false
         end
       end
       

data/lib/sh_player.rb

@@ -87,7 +87,7 @@ module Sh
           end
         end
 
-        @@scrobble_queue << Scrobbler::Scrobble.new(
+        @@scrobble_queue << {
           :session_id => auth.session_id,
           :submission_url => auth.submission_url,
           :artist => song.artist.name,
@@ -95,7 +95,7 @@ module Sh
           :album => song.album.title,
           :time => Time.new,
           :length => duration,
-          :track_number => song.track_num)
+          :track_number => song.track_num}
 
         # No point attempting to scrobble without authentication
         return if auth.status.strip.upcase != 'OK'
@@ -103,10 +103,15 @@ module Sh
         Thread.new do
           failed_scrobbles = []
           until @@scrobble_queue.empty?
-            scrobble = @@scrobble_queue.pop
-            scrobble.submit! rescue Exception
+            scrobble = nil
+            begin
+              scrobble = Scrobbler::Scrobble.new(@@scrobble_queue.pop)
+              scrobble.submit!
+            rescue
+              scrobble = nil
+            end
 
-            if scrobble.status.strip.upcase == 'OK'
+            if scrobble and scrobble.status.strip.upcase == 'OK'
               puts "Scrobble for '#{scrobble.track}' succeeded"
             else
               puts "Warning: Scrobble for '#{scrobble.track}' failed"

data/lib/sh_song.rb

@@ -9,8 +9,8 @@ include MusicBrainz
 module Sh
   class Song
     attr_reader :path, :mime, :matches
-    attr_writer :album, :artist
-    attr_accessor :title, :mbid, :lyrics, :track_num
+    attr_writer :album, :artist, :track_num
+    attr_accessor :title, :mbid, :lyrics
     attr_accessor :db_id
 
     def initialize path
@@ -29,6 +29,10 @@ module Sh
       return @artist
     end
 
+    def track_num
+      return (@track_num || 0).to_i
+    end
+
     def duration
       @duration ||= Sh::TagReader.read(path)[:duration]
     end
@@ -36,11 +40,6 @@ module Sh
     def lookup!
       begin
         track = lookup_multiple.first
-      rescue Exception
-        return
-      end
-      
-      if track
         # Don't distinguish between bands with the same name by adding to the name
         track.artist.disambiguation = false
         # Pull data from response
@@ -57,7 +56,11 @@ module Sh
         tracks.to_a.each_with_index do |t, i|
           self.track_num = i + 1 if t.title == track.title and t.duration == track.duration
         end
+      rescue Exception
+        return false
       end
+      
+      return true
     end
 
     private

data/lib/sh_util.rb

@@ -69,6 +69,23 @@ class StringMatcher
   end
 end
 
+require 'thread'
+require 'gtkhtml2'
+module Gtk
+  class HtmlView
+    def set_html content=nil
+      @doc_mutex ||= Mutex.new
+      doc = self.document ||= HtmlDocument.new
+      @doc_mutex.synchronize do
+        doc.open_stream 'text/html'
+        content ||= (yield || '')
+        doc.write_stream content
+        doc.close_stream
+      end
+    end
+  end
+end
+
 module Kelp
   class ProgressDialog < Gtk::Dialog
     def initialize(title)

data/lib/sh_view.rb

@@ -5,6 +5,7 @@ require 'sh_lyrics'
 require 'sh_cover_art'
 require 'sh_mmkeys'
 require 'gtk2'
+require 'gtkhtml2'
 include Gtk
 
 module Sh
@@ -173,17 +174,16 @@ module Sh
       @img_cover = Image.new
       event_box = EventBox.new
       event_box.add @img_cover
-      event_box.signal_connect("button-press-event") do |w, event|
+      event_box.signal_connect('button-press-event') do |w, event|
         Kelp::ImageDialog.new(@pixbuf, @player.song.album.title).show if @pixbuf and @player
       end
       @img_cover.height_request = 150
       sidebar.pack_start event_box, false, false, 0
       # Lyrics text view
-      @txt_lyrics = TextView.new
-      @txt_lyrics.editable = false
+      @html_lyrics = HtmlView.new
       scr_lyrics = ScrolledWindow.new(nil, nil)
       scr_lyrics.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-      scr_lyrics.add @txt_lyrics
+      scr_lyrics.add @html_lyrics
       # Browse area
       browse = Sh::Browse.new self
       queue = Sh::Queue.new self
@@ -384,14 +384,16 @@ module Sh
         end
         # Lyrics
         if $prefs[:lyrics]
-          @txt_lyrics.buffer.text = "Loading..."
+          @html_lyrics.set_html 'Loading...'
           Thread.new do
             if not song.lyrics
               song.lyrics = Sh::Lyrics.get_lyrics(song)
               $db.save_song song
             end
             # Show lyrics unless requests have been shuffled
-            @txt_lyrics.buffer.text = song.lyrics if @player.song == song
+            if @player.song == song
+              show_lyrics song
+            end
           end
         end
         if @rnotify
@@ -404,6 +406,27 @@ module Sh
       end
     end
 
+    def show_lyrics song
+      lyrics = song.lyrics || "[Lyrics not found]"
+      @html_lyrics.set_html do
+        %{
+        <h2>#{song.title}</h2>
+        <pre style='font-family: sans-serif;'>#{lyrics}</pre>
+        <p></p><a href="#reload">Reload lyrics</a>
+        }
+      end
+      @html_lyrics.document.signal_connect('link-clicked') do |doc, loc|
+        if loc == '#reload'
+          @html_lyrics.set_html 'Loading...'
+          Thread.new do
+            song.lyrics = Sh::Lyrics.get_lyrics(song)
+            $db.save_song song
+            show_lyrics song if @player and @player.song == song
+          end
+        end
+      end
+    end
+
     public
     def queue
       return @queue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 +10:00
+date: 2009-08-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - rake
 - libgnome2-ruby
+- libgtk-mozembed-ruby
 - libsqlite3-ruby
 - libglade2-ruby
 - ruby-dev