shroom 0.0.9 → 0.0.10

data/README

@@ -4,9 +4,31 @@ Shroom
 Dependencies
 ------------
 
-ruby-gnome2
-ruby-gstreamer
-ruby-sqlite3
+'rake'
+'libwxgtk2.8-0'
+'libgnome2-ruby'
+'libglade2-ruby'
+'libgtkhtml2-ruby'
+'libsqlite3-ruby'
+'ruby-dev'
+'libopenssl-ruby'
+'libmp3lame-dev'
+'libvorbis-dev'
+'build-essential'
+
+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')
 
 Repository
 ----------

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.9'
+  s.version = '0.0.10'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'

data/lib/sh_actions.rb

@@ -0,0 +1,146 @@
+module Sh
+	class Actions
+		@@actions = []
+		attr_reader :name, :tags, :user_data
+	
+		def initialize name, *tags, &block
+			@@actions << self
+			@name = name
+			@tags = tags
+			@block = block
+			@user_data = {}
+		end
+	
+		def []=(key, value)
+			@user_data[key] = value
+		end
+	
+		def [](key)
+			return @user_data[key]
+		end
+	
+		def execute *args
+			@block.call *args
+		end
+	
+		def self.get *tags
+			matches = []
+			@@actions.each do |action|
+				subset = true
+				tags.each do |tag|
+					subset = false unless action.tags.include? tag
+				end
+				matches << action if subset
+			end
+			return matches
+		end
+	end
+	
+	class ShroomActions
+		def self.init
+			action = Actions.new 'Add to queue', :song do |song|
+				view = Sh::View.instance
+				if view
+		      queue = view.queue
+		      if queue
+		        queue << song
+		      else
+		        view.queue = [song]
+		        view.queue_pos = 0
+		      end
+        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
+        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
+        end
+			end
+			action[:stock_image] = Stock::FIND
+			
+			action = Actions.new 'Add to playlist', :song, :playlist do |song, playlist|
+				playlist << song
+				playlist.save!
+			end
+			action[:stock_image] = Stock::ADD
+			
+			action = Actions.new 'Properties', :song do |song|
+				show_song_properties_dialog(song)
+			end
+			action[:stock_image] = Stock::PROPERTIES
+		end
+		
+    def self.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
+      	browse = Sh::Browse.instance
+        song.title = txt_title.text
+        song.artist = cmb_artist.active_iter[1]
+        song.album = cmb_album.active_iter[1]
+        browse.remove_song song if browse
+        $db.save_song song
+        browse.insert_song song if browse
+        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
+	end
+end

data/lib/sh_album.rb

@@ -1,6 +1,5 @@
 module Sh
   class Album
-    attr_writer :artist
     attr_accessor :title, :mbid, :image_path, :info, :date
     attr_accessor :db_id
 
@@ -8,13 +7,8 @@ module Sh
       @songs = []
     end
 
-    def artist
-      #@artist = $db.artists(:id => @artist.db_id).first if @artist and @artist.db_id
-      return @artist
-    end
-
     def to_s
       return self.title
     end
   end
-end
+end

data/lib/sh_browse.rb

@@ -1,6 +1,10 @@
 module Sh
   class Browse
+  	@@instance = nil
+  	
     def initialize view
+    	Sh::Log.warning 'Instance of Browse already created!' if @@instance
+    	@@instance = self
       @tree = TreeView.new
       @tree.selection.mode = Gtk::SELECTION_MULTIPLE
 
@@ -22,6 +26,13 @@ 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)
       @tree.model = @model
 
       GLib::Timeout.add(1000) do
@@ -54,42 +65,31 @@ module Sh
           if data.is_a? Sh::Song
             song = data
             menu = Menu.new
-
-            pbtn_add_to_queue = ImageMenuItem.new Stock::ADD
-            menu.append pbtn_add_to_queue
-            pbtn_add_to_queue.signal_connect('activate') do |widget|
-              queue = view.queue
-              if queue
-                queue << song
-              else
-                view.queue = [song]
-                view.queue_pos = 0
-              end
-            end
-
-            pbtn_lookup = MenuItem.new 'Lookup metadata automatically'
-            menu.append pbtn_lookup
-            pbtn_lookup.signal_connect('activate') do |widget|
-              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
-              insert_song song
-            end
             
-            pbtn_properties = ImageMenuItem.new Stock::PROPERTIES
-            menu.append pbtn_properties
-            pbtn_properties.signal_connect('activate') do |widget|
-              show_song_properties_dialog(song)
+            Actions.get(:song).each do |action|
+	          	pbtn = nil
+	          	if action[:stock_image]
+	          		pbtn = ImageMenuItem.new(action.name)
+	          		pbtn.image = Image.new(action[:stock_image], IconSize::MENU)
+	          	else
+	            	pbtn = MenuItem.new(action.name)
+	            end
+	          	menu.append pbtn
+							if action.tags.include? :playlist
+								pmnu = Gtk::Menu.new
+								Sh::Playlists.load_playlists.each do |playlist|
+				        	pbtn_playlist = Gtk::MenuItem.new playlist.name
+				        	pbtn_playlist.signal_connect('activate') do |widget|
+				        		action.execute song, playlist
+				        	end
+				        	pmnu.append pbtn_playlist
+				        end
+				        pbtn.submenu = pmnu
+							else
+			        	pbtn.signal_connect('activate') do |widget|
+			        		action.execute song
+			        	end
+			        end
             end
             
             menu.show_all
@@ -129,64 +129,9 @@ module Sh
       @scroll.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
       @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
+    
+    def self.instance
+    	return @@instance
     end
 
     def remove_song song
@@ -250,6 +195,7 @@ module Sh
     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
@@ -279,7 +225,7 @@ module Sh
     end
 
     def widget
-      @scroll
+      return @scroll
     end
   end
-end
+end

data/lib/sh_cover_art.rb

@@ -1,35 +1,28 @@
-require 'open-uri'
 require 'rexml/document'
-require 'cgi'
 
 module Sh
   class CoverArt
-    def CoverArt.get_cover song
+    def self.get_cover song
       artist, album = song.artist.name, song.album.title
-      path = "#{$cover_dir}/#{artist.to_md5}_#{album.to_md5}"
-      if Ping.pingecho("audioscrobbler.com", 5) and not File.exists?(path)
-        doc = lastfm("album.getInfo", {: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
+      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}"
+        if File.exists? path and File.size?(path) > 0
+          return path
+        elsif Ping.pingecho("audioscrobbler.com", 5)
+          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
             end
           end
         end
+        return path if File.exists? path
       end
-      if File.exists? path
-        return path
-      else
-        return nil
-      end
-    end
-
-    private
-    def CoverArt.lastfm(method, arg_map = {}.freeze)
-      args = arg_map.collect { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v)}"}.join('&')
-      url = "http://ws.audioscrobbler.com/2.0/?method=#{method}&api_key=#{Sh::KEYS[:lastfm]}&#{args}"
-      return REXML::Document.new(open(url).read)
     end
   end
 end

data/lib/sh_cover_browse.rb

@@ -0,0 +1,54 @@
+module Sh
+  class CoverBrowse
+  	COL_PIXBUF, COL_ALBUM = (0..1).to_a
+  	
+    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
+      end
+      @model.set_sort_column_id(TreeSortable::DEFAULT_SORT_COLUMN_ID,
+      	Gtk::SORT_ASCENDING)
+      
+      @iconview = IconView.new @model
+      @iconview.pixbuf_column = COL_PIXBUF
+      @iconview.signal_connect 'item_activated' do |iconview, path|
+      	iter = @model.get_iter path
+      	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.play
+      	end
+      end
+
+      GLib::Timeout.add(1000) do
+        fill_model
+        false
+      end
+
+      @scroll = ScrolledWindow.new(nil, nil)
+      @scroll.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
+      @scroll.add @iconview
+    end
+
+    def fill_model
+      @model.clear
+    	$db.albums.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
+          # Insufficient data about album
+        end if album
+    	end
+    end
+
+    def widget
+      return @scroll
+    end
+  end
+end