shroom 0.0.10 → 0.0.11

data/README

@@ -1,38 +1,31 @@
-Shroom
-======
+== Shroom
 
-Dependencies
-------------
+=== Dependencies
 
-'rake'
-'libwxgtk2.8-0'
-'libgnome2-ruby'
-'libglade2-ruby'
-'libgtkhtml2-ruby'
-'libsqlite3-ruby'
-'ruby-dev'
-'libopenssl-ruby'
-'libmp3lame-dev'
-'libvorbis-dev'
-'build-essential'
+* rake
+* libwxgtk2.8-0
+* libgnome2-ruby
+* libglade2-ruby
+* libsqlite3-ruby
+* ruby-dev
+* libopenssl-ruby
+* libmp3lame-dev
+* libvorbis-dev
+* build-essential
 
-Gem dependencies
-----------------
+=== Gem dependencies
 
-('ruby-mp3info', '>= 0.6.13')
-('MP4Info', '>= 0.3.3')
-('ruby-ogginfo', '>= 0.3.2')
-('flacinfo-rb', '>= 0.4')
-('earworm', '>= 0.0.2')
-('sequel', '>= 3.2.0')
-('wxruby', '>= 2.0.0')
-('rbrainz', '>= 0.5.0')
-('scrobbler', '>= 0.2.3')
-('shared-mime-info', '>= 0.1')
+* ruby-mp3info (>= 0.6.13)
+* MP4Info (>= 0.3.3)
+* ruby-ogginfo (>= 0.3.2)
+* flacinfo-rb (>= 0.4)
+* earworm (>= 0.0.2)
+* sequel (>= 3.2.0)
+* wxruby (>= 2.0.0)
+* rbrainz (>= 0.5.0)
+* scrobbler (>= 0.2.3)
 
-Repository
-----------
-
-The latest source code should be available at:
- http://bitbucket.org/dismal_denizen/shroom/
+=== Repository
 
+The latest source code should be available at
+http://bitbucket.org/dismal_denizen/shroom

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.10'
+  s.version = '0.0.11'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'
@@ -25,16 +25,14 @@ spec = Gem::Specification.new do |s|
   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 << 'rake'
   s.requirements << 'libwxgtk2.8-0'
   s.requirements << 'libgnome2-ruby'
   s.requirements << 'libglade2-ruby'
-  s.requirements << 'libgtkhtml2-ruby'
   s.requirements << 'libsqlite3-ruby'
+  s.requirements << 'libopenssl-ruby'
   # Requirements for icanhasaudio
   s.requirements << 'ruby-dev'
-  s.requirements << 'libopenssl-ruby'
   s.requirements << 'libmp3lame-dev'
   s.requirements << 'libvorbis-dev'
   s.requirements << 'build-essential'

data/lib/sh_actions.rb

@@ -51,25 +51,28 @@ module Sh
         end
       end
       action[:stock_image] = Stock::ADD
-            
+
 			action = Actions.new 'Reread tags', :song do |song|
 				browse = Sh::Browse.instance
 				browse.remove_song song if browse
-        song.read_tags!(true)
-        $db.save_song song
+        path = song.path
+        song.delete
+        song = Database.add_song path
         browse.insert_song song if browse
 			end
 			action[:stock_image] = Stock::HARDDISK
-			
-			action = Actions.new 'Lookup metadata automatically', :song do |song|
-				if song.lookup!
-					browse = Sh::Browse.instance
-          browse.remove_song song if browse
-          $db.save_song song
-          browse.insert_song song if browse
+
+      if try_require 'earworm' and try_require 'rbrainz'
+        action = Actions.new 'Lookup metadata automatically', :song do |song|
+          if song.lookup!
+            browse = Sh::Browse.instance
+            browse.remove_song song if browse
+            song.save
+            browse.insert_song song if browse
+          end
         end
-			end
-			action[:stock_image] = Stock::FIND
+        action[:stock_image] = Stock::FIND
+      end
 			
 			action = Actions.new 'Add to playlist', :song, :playlist do |song, playlist|
 				playlist << song
@@ -87,17 +90,19 @@ module Sh
       glade = Global::GLADE['dlg_song']
       dlg_song = glade['dlg_song']
       txt_title = glade['txt_title']
-      txt_title.text = song.title
+      txt_title.text = song.title || File.basename(song.path)
+      spn_track_num = glade['spn_track_num']
+      spn_track_num.value = song.track_num || 0
 
       # 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|
+      Artist.order(: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
+        sel = i if song.artist && artist.id == song.artist.id
       end
       cmb_artist.model = sto_artists
       cmb_artist.active = sel
@@ -106,11 +111,11 @@ module Sh
       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|
+      Album.order(: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
+        sel = i if song.album && album.id == song.album.id
       end
       cmb_album.model = sto_albums
       cmb_album.active = sel
@@ -125,12 +130,13 @@ module Sh
       end
       btn_ok = glade['btn_ok']
       ok_handle = btn_ok.signal_connect('clicked') do
-      	browse = Sh::Browse.instance
+      	browse = Browse.instance
         song.title = txt_title.text
+        song.track_num = spn_track_num.value
         song.artist = cmb_artist.active_iter[1]
         song.album = cmb_album.active_iter[1]
         browse.remove_song song if browse
-        $db.save_song song
+        song.save
         browse.insert_song song if browse
         dlg_song.hide
       end

data/lib/sh_browse.rb

@@ -15,9 +15,9 @@ module Sh
         data = iter[0]
         if data.is_a? Sh::Song
           if data.title
-            cell.text = sprintf("%.2d\t%s", data.track_num, data.title)
+            cell.text = "%.2d\t%s" % [data.track_num, data.title]
           else
-            cell.text = data.path.split('/').last
+            cell.text = File.basename(data.path)
           end
         else
           cell.text = data.to_s
@@ -26,13 +26,12 @@ module Sh
       @tree.append_column col_artist
 
       @model = TreeStore.new(Object, Array)
-#      TODO: use this
-#      @model.set_default_sort_func do |a, b|
-#        oa, ob = a[0], b[0]
-#        oa.to_s <=> ob.to_s
-#      end
-#      @model.set_sort_column_id(TreeSortable::DEFAULT_SORT_COLUMN_ID,
-#      	Gtk::SORT_ASCENDING)
+      @model.set_default_sort_func do |a, b|
+        oa, ob = a[0], b[0]
+        oa.to_s <=> ob.to_s
+      end
+      @model.set_sort_column_id(TreeSortable::DEFAULT_SORT_COLUMN_ID,
+        Gtk::SORT_ASCENDING)
       @tree.model = @model
 
       GLib::Timeout.add(1000) do
@@ -100,8 +99,7 @@ module Sh
       @tree.signal_connect('row_activated') do |widget, path, col|
         iter = @tree.model.get_iter(path)
         parent = iter.parent
-        song = iter[0]
-        if song.is_a? Sh::Song
+        if iter[0].is_a? Song
           view.stop
           queue = []
           while iter.parent == parent
@@ -118,7 +116,7 @@ module Sh
           view.queue = queue
           view.queue_pos = prev.size
           view.play
-        else
+        elsif not iter[1].empty?
           view.stop
           view.queue = iter[1].dup
           view.play
@@ -131,7 +129,11 @@ module Sh
     end
     
     def self.instance
-    	return @@instance
+      return @@instance
+    end
+
+    def widget
+      return @scroll
     end
 
     def remove_song song
@@ -158,74 +160,102 @@ module Sh
     end
 
     def insert_song song
-      artist_node = album_node = prev_song_node = nil
-      @model.each do |model, path, iter|
-        data = iter[0]
+      artist_node = album_node = nil
 
-        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 song.album.special_case?
+        artist_node = @artist_nodes[song.artist.id]
+      else
+        artist_node = @artist_nodes[song.album.artist.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
+      if artist_node and artist_node.has_child?
+        iter = artist_node.first_child
+        loop do
+          if iter[0].id == song.album.id
+            album_node = iter
+            break
+          else
+            break unless iter.next!
           end
         end
       end
+
       # Artist node
       unless artist_node
-        artist_node = @model.append nil
-        artist_node[0] = song.artist
-        artist_node[1] = []
+        artist_node = create_artist_node song.artist
       end
-      artist_node[1] << song
+
       # Album node
       unless album_node
-        album_node = @model.append artist_node
-        album_node[0] = song.album
-        album_node[1] = []
+        album_node = create_album_node artist_node, song.album, []
       end
+
+      artist_node[1] << song
+      artist_node[1] = artist_node[1].sort_by{|s| s.to_s}
       album_node[1] << song
+      album_node[1] = album_node[1].sort_by{|s| s.to_s}
+
       # Song node
-      song_node = @model.insert_after(album_node, prev_song_node)
+      song_node = @model.append album_node
       song_node[0] = song
       song_node[1] = [song]
     end
 
     def fill_model
-    	@model.clear
-      artist_node = album_node = track_node = nil
-      $db.songs.sort_by {|a| (a.to_s || '')}.each do |song|
-        artist = song.artist
-        if not artist_node or artist_node[0].db_id != artist.db_id
-          artist_node = @model.append nil
-          artist_node[0] = artist
-          # Required for proper handling of multiple artists with on album
-          album_node = nil
+      @artist_nodes = {}
+      @model.clear
+
+      Artist.each do |artist|
+        artist_node = create_artist_node artist
+
+        unknown_album_songs = []
+        non_album_songs = []
+        artist.songs.each do |song|
+          if song.album.id == Album::UNKNOWN
+            unknown_album_songs << song
+          elsif song.album.id == Album::NON_ALBUM
+            non_album_songs << song
+          end
         end
-        artist_node[1] ||= []
-        artist_node[1] << song
 
-        album = song.album
-        if not album_node or album_node[0].db_id != album.db_id
-          album_node = @model.append artist_node
-          album_node[0] = album
+        unless unknown_album_songs.empty?
+          create_album_node artist_node, Album[Album::UNKNOWN], unknown_album_songs
+        end
+        unless non_album_songs.empty?
+          create_album_node artist_node, Album[Album::NON_ALBUM], non_album_songs
         end
-        album_node[1] ||= []
-        album_node[1] << song
 
-        track_node = @model.append album_node
-        track_node[0] = song
-        track_node[1] = [song]
+        artist.albums.each do |album|
+          create_album_node artist_node, album, album.songs
+        end
+
+        artist_node[1] = artist_node[1].sort_by {|s| s.to_s}
 
         Kelp.process_events
       end
     end
 
-    def widget
-      return @scroll
+    private
+    def create_artist_node artist
+      artist_node = @model.append nil
+      @artist_nodes[artist.id] = artist_node
+      artist_node[0] = artist
+      artist_node[1] = []
+      return artist_node
+    end
+    
+    def create_album_node artist_node, album, songs
+      songs = songs.sort_by {|s| s.to_s}
+      album_node = @model.append artist_node
+      album_node[0] = album
+      album_node[1] = songs
+      songs.each do |song|
+        song_node = @model.append album_node
+        song_node[0] = song
+        song_node[1] = [song]
+        artist_node[1] << song
+      end
+      return album_node
     end
   end
 end

data/lib/sh_cover_art.rb

@@ -7,17 +7,15 @@ module Sh
       if artist and album
         @lastfm_rest ||= Rest::Get.new("http://ws.audioscrobbler.com/2.0",
           :api_key => Sh::KEYS[:lastfm], :method => "album.getInfo")
-        path = "#{$cover_dir}/#{artist.to_md5}_#{album.to_md5}"
+        path = "#{Global::PATHS[:cover_dir]}/#{artist.to_md5}_#{album.to_md5}"
         if File.exists? path and File.size?(path) > 0
           return path
-        elsif Ping.pingecho("audioscrobbler.com", 5)
+        else
           doc = REXML::Document.new(@lastfm_rest[:artist => artist, :album => album])
           img_url = REXML::XPath.first(doc, '//image[@size="extralarge"]').text
           if img_url
             open(path, 'w') do |output|
-              open(img_url) do |input|
-                output << input.read
-              end
+              output << open(img_url).read
             end
           end
         end
@@ -26,4 +24,3 @@ module Sh
     end
   end
 end
-

data/lib/sh_cover_browse.rb

@@ -5,7 +5,12 @@ module Sh
     def initialize view
       @model = ListStore.new(Gdk::Pixbuf, Object)
       @model.set_default_sort_func do |a, b|
-        a[COL_ALBUM].title <=> b[COL_ALBUM].title
+        album_a, album_b = a[COL_ALBUM], b[COL_ALBUM]
+        comparison = album_a.artist.name <=> album_b.artist.name
+        if comparison == 0
+          comparison = album_a.title <=> album_b.title
+        end
+        comparison
       end
       @model.set_sort_column_id(TreeSortable::DEFAULT_SORT_COLUMN_ID,
       	Gtk::SORT_ASCENDING)
@@ -17,8 +22,7 @@ module Sh
       	album = iter[COL_ALBUM]
       	if album
       		view.stop
-      		songs = $db.songs(:album_id => album.db_id)
-          view.queue = songs.sort_by {|s| (s.to_s || '')}
+          view.queue = album.songs.sort_by {|s| (s.to_s || '')}
           view.play
       	end
       end
@@ -35,15 +39,15 @@ module Sh
 
     def fill_model
       @model.clear
-    	$db.albums.each do |album|
+    	Album.each do |album|
         begin
           pixbuf = Gdk::Pixbuf.new(album.image_path).scale(128, 128)
           iter = @model.append
           iter[COL_ALBUM] = album
           iter[COL_PIXBUF] = pixbuf
-        rescue Exception
+        rescue
           # Insufficient data about album
-        end if album
+        end
     	end
     end