shroom 0.0.11 → 0.0.12

data/lib/{shroom-res → res}/shroom.glade

@@ -290,7 +290,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">&#x25CF;</property>
-                <property name="adjustment">1 1 99 1 5 5</property>
+                <property name="adjustment">1 0 99 1 5 5</property>
               </widget>
               <packing>
                 <property name="left_attach">2</property>

data/lib/res/shroom_resources_signpost

@@ -0,0 +1,2 @@
+This file acts as a signpost to help find the Shroom resources directory, where
+I live. Please do not delete me.

data/lib/sh_actions.rb

@@ -45,30 +45,29 @@ module Sh
 		      if queue
 		        queue << song
 		      else
-		        view.queue = [song]
-		        view.queue_pos = 0
+		        view.set_queue([song])
 		      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
-        path = song.path
-        song.delete
-        song = Database.add_song path
-        browse.insert_song song if browse
+				view = Sh::View.instance
+        proc = Proc.new do |s|
+          path = s.path
+          s.delete
+          Database.add_song path
+        end
+        view ? view.update_song(song, &proc) : proc.call(song)
 			end
 			action[:stock_image] = Stock::HARDDISK
 
       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
+            view = Sh::View.instance
+            proc = Proc.new {|s| s.save}
+            view ? view.update_song(song, &proc) : proc.call(song)
           end
         end
         action[:stock_image] = Stock::FIND
@@ -130,14 +129,13 @@ module Sh
       end
       btn_ok = glade['btn_ok']
       ok_handle = btn_ok.signal_connect('clicked') do
-      	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
-        song.save
-        browse.insert_song song if browse
+        view = Sh::View.instance
+        proc = Proc.new {|s| s.save}
+        view ? view.update_song(song, &proc) : proc.call(song)
         dlg_song.hide
       end
       btn_cancel = glade['btn_cancel']

data/lib/sh_browse.rb

@@ -1,10 +1,6 @@
 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
 
@@ -13,7 +9,7 @@ module Sh
       col_artist.set_cell_data_func(ren_artist) do |tvc, cell, model, iter|
         cell.text = ''
         data = iter[0]
-        if data.is_a? Sh::Song
+        if data.is_a? Song
           if data.title
             cell.text = "%.2d\t%s" % [data.track_num, data.title]
           else
@@ -26,9 +22,19 @@ module Sh
       @tree.append_column col_artist
 
       @model = TreeStore.new(Object, Array)
-      @model.set_default_sort_func do |a, b|
-        oa, ob = a[0], b[0]
-        oa.to_s <=> ob.to_s
+      @model.set_default_sort_func do |oa, ob|
+        a1, b1 = oa[0].to_s, ob[0].to_s
+        a2, b2 = a1.gsub(/[^\w ]/, ""), b1.gsub(/[^\w ]/, "")
+        cmp = 0
+
+        unless a2.empty? or b2.empty?
+          cmp = a2.casecmp b2 if cmp == 0
+          cmp = a2 <=> b2 if cmp == 0
+        end
+
+        cmp = a1.casecmp b1 if cmp == 0
+        cmp = a1 <=> b1 if cmp == 0
+        cmp
       end
       @model.set_sort_column_id(TreeSortable::DEFAULT_SORT_COLUMN_ID,
         Gtk::SORT_ASCENDING)
@@ -113,12 +119,11 @@ module Sh
             iter.next!
           end
           queue.insert 0, *prev
-          view.queue = queue
-          view.queue_pos = prev.size
+          view.set_queue queue, prev.size
           view.play
         elsif not iter[1].empty?
           view.stop
-          view.queue = iter[1].dup
+          view.set_queue iter[1].dup
           view.play
         end
       end
@@ -127,16 +132,21 @@ module Sh
       @scroll.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
       @scroll.add @tree
     end
-    
-    def self.instance
-      return @@instance
-    end
 
     def widget
       return @scroll
     end
 
+    def update_song song
+      # TODO: Improve this
+      remove_song song
+      new_song = yield song
+      song = new_song if new_song.is_a? Song
+      insert_song song
+    end
+
     def remove_song song
+      # TODO: Improve this
       song_node = nil
       if song.is_a? TreeIter
         song_node = song
@@ -153,9 +163,11 @@ module Sh
         artist_node = album_node.parent
         @model.remove song_node
         album_node[1].delete song
-        @model.remove album_node unless album_node.has_child?
+        # Removal of these nodes are commented out because they can result
+        # in parentless song nodes
+        #@model.remove album_node unless album_node.has_child?
         artist_node[1].delete song
-        @model.remove artist_node unless artist_node.has_child?
+        #@model.remove artist_node unless artist_node.has_child?
       end
     end
 

data/lib/sh_cover_browse.rb

@@ -22,7 +22,7 @@ module Sh
       	album = iter[COL_ALBUM]
       	if album
       		view.stop
-          view.queue = album.songs.sort_by {|s| (s.to_s || '')}
+          view.set_queue(album.songs.sort_by {|s| s.to_s || ''})
           view.play
       	end
       end

data/lib/sh_database.rb

@@ -97,6 +97,15 @@ module Sh
         s.album = album
         s.title = tags[:title]
         s.track_num = tags[:track_num]
+
+        image = tags[:cover_art]
+        if image
+          image_path = File.join(Global::PATHS[:cover_dir], image.to_md5)
+          open(image_path, 'w') do |file|
+            file.write image
+          end
+          s.image_path = image_path
+        end
       end
 
       return song
@@ -158,12 +167,13 @@ module Sh
     many_to_one :album
 
     def to_s
-      return "%s, %s, %.2d - %s" % [artist, album, track_num, title]
+      metadata = [artist, album, track_num, title || File.basename(path)]
+      return "%s, %s, %.2d - %s" % metadata
     end
 
     def to_html
       t = title
-      t = "Unknown" if not t or t.strip == ""
+      t = File.basename(path) if not t or t.strip == ""
       t = CGI.escapeHTML t
       ar = artist.name
       ar = "Unknown" if not ar or ar.strip == ""

data/lib/sh_fingerprint.rb

@@ -7,8 +7,8 @@ module Sh
       Log.debug "Earworming #{song.path}"
       ew = Earworm::Client.new(KEYS[:music_dns])
       info = ew.identify :file => song.path
-      title = unescape_html info.title
-      artist_name = unescape_html info.artist_name
+      title = info.title.unescape_html
+      artist_name = info.artist_name.unescape_html
       puids = info.puid_list || []
       return false unless title and artist_name
 
@@ -47,18 +47,5 @@ module Sh
 
       return true
     end
-
-    def self.unescape_html str
-      entities = {
-        """ => "\"",
-        "'" => "'",
-        "&" => "&",
-        "&lt;" => "<",
-        "&gt;" => ">",
-        "&nbsp;" => " "
-      }
-
-      return CGI.unescapeHTML(str.gsub(/&\w*;/) {|e| entities[e] || e})
-    end
   end
 end

data/lib/sh_global.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pathname'
 require 'yaml'
 require 'libglade2'
 require 'ping'
@@ -12,7 +13,7 @@ module Sh
   }
 
   class Global
-    SUPPORTED_EXTENSIONS = ['.mp3', '.m4a', '.ogg', '.flac', '.wma', '.wav']
+    SUPPORTED_EXTENSIONS = %w{.mp3 .m4a .ogg .oga .flac .wma .wav}
     GLADE = {}
     PATHS = {}
 
@@ -56,7 +57,8 @@ module Sh
     end
 
     def self.locate(file)
-      find_in_load_path("shroom-res/#{file}") || "shroom-res/#{file}"
+      signpost = find_in_load_path(File.join("res", "shroom_resources_signpost"))
+      return Pathname.new(signpost).dirname.join(file).expand_path.to_s if signpost
     end
 
     def self.prefs

data/lib/sh_lastfm.rb

@@ -0,0 +1,64 @@
+require 'hpricot'
+
+module Sh
+  class LastFM
+    @album_getInfo = Rest::Get.new("http://ws.audioscrobbler.com/2.0",
+      :api_key => KEYS[:lastfm], :method => "album.getInfo")
+    @artist_getInfo = Rest::Get.new("http://ws.audioscrobbler.com/2.0",
+      :api_key => KEYS[:lastfm], :method => "artist.getInfo")
+
+    def self.get_album_info album
+      artist = album.artist.name
+      title = album.title
+
+      if artist and title
+        image_path = File.join(Global::PATHS[:cover_dir], "#{artist.to_md5}_#{title.to_md5}")
+        doc = Hpricot(@album_getInfo[:artist => artist, :album => title])
+
+        if File.exists? image_path and File.size?(image_path) and File.size?(image_path) > 0
+          album.image_path = image_path
+        else
+          begin
+            img_url = doc.at('/lfm/album/image[@size="extralarge"]').inner_html.strip
+            input = open(img_url).read
+            if input and not input.empty?
+              open(image_path, 'w') {|output| output << input}
+              album.image_path = image_path
+            end
+          rescue
+            album.image_path = nil
+          end
+        end
+
+        (album.info ||= (doc/'/lfm/album/wiki/content').inner_text.strip.unescape_html) rescue Exception
+        (album.mbid ||= (doc/'/lfm/album/mbid').inner_html.strip) rescue Exception
+      end
+      album.save
+    end
+
+    def self.get_artist_info artist
+      name = artist.name
+
+      if name
+        image_path = File.join(Global::PATHS[:cover_dir], name.to_md5)
+        doc = Hpricot(@artist_getInfo[:artist => name])
+
+        size = File.size?(image_path)
+        if File.exists? image_path and size and size > 0
+          artist.image_path = image_path
+        else
+          begin
+            img_url = doc.at('/lfm/artist/image[@size="extralarge"]').inner_html.strip
+            open(image_path, 'w') {|output| output << open(img_url).read}
+            artist.image_path = image_path
+          rescue
+            artist.image_path = nil
+          end
+        end
+      end
+
+      (artist.info ||= (doc/'/lfm/artist/bio/content').inner_text.strip.unescape_html) rescue Exception
+      (artist.mbid ||= (doc/'/lfm/artist/mbid').inner_html.strip) rescue Exception
+    end
+  end
+end

data/lib/sh_log.rb

@@ -6,22 +6,24 @@ module Sh
 			end
 			
 			def write str
-				@buffer ||= ''
+				@buffer ||= ""
 				@buffer << str
-				if @buffer.end_with? "\n"
-					case @type
-					when :stderr
-						Log.error '> ' + @buffer
-					when :stdout
-						Log.info '> ' + @buffer
-					end
-					@buffer = nil
-				end
+				flush if @buffer.end_with? "\n"
 			end
 			
 			def puts str
-				write str + "\n"
+				write "#{str}\n"
 			end
+
+      def flush
+        case @type
+        when :stderr
+          Log.error "> #{@buffer}"
+        when :stdout
+          Log.info "> #{@buffer}"
+        end
+        @buffer = ""
+      end
 		end
 		
 		LEVELS = [:debug, :info, :warning, :error]

data/lib/sh_main.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # Problems occur when 'socket' is not required first
 require 'socket'
@@ -20,7 +20,7 @@ module Sh
   class Main
     def initialize
     	Log.info 'Shroom started'
-      
+
       # See sh_player.rb for why this Wx stuff is necessary
       Wx::App.run do
         View.new.show

data/lib/sh_playlist.rb

@@ -14,8 +14,14 @@ module Sh
           line.strip!
           unless line[0] == ?# or line.empty?
             begin
-              # TODO: make cross-platform
-              ref = File.expand_path(line.gsub('\\', '/'), File.dirname(path))
+              ref = line
+              begin
+                ref = GLib.filename_from_uri(ref)
+              rescue
+                # TODO: make cross-platform
+                ref = File.expand_path(ref.gsub('\\', '/'), File.dirname(path))
+              end
+              
               if File.exists? ref
                 if Global::SUPPORTED_EXTENSIONS.include? File.extname(ref)
                   list << (Song.first(:path => ref) || Database.add_song(ref))

data/lib/sh_queue.rb

@@ -30,7 +30,7 @@ module Sh
         iter = lst_tabs.model.get_iter(path)
         song = iter[1]
         view.stop
-        view.queue_pos = path.indices.first
+        view.set_queue_pos path.indices.first
         view.play
       end
     end

data/lib/sh_tagreader.rb

@@ -1,9 +1,10 @@
 require 'sh_util'
 require 'sh_log'
+require 'base64'
 
 module Sh
   class TagReader
-    def self.read path, &block
+    def self.read path
       # Ensure that the path is absolute
       @path = File.expand_path path
       
@@ -15,7 +16,7 @@ module Sh
       else
       	# Attempt to use the `file` command
       	begin
-        	type = `file --mime-type -b #{@path}`
+        	type = `file --mime-type -b "#{@path.gsub('"', '\\"')}"`.strip
         	@mime = type if type[0..5] == 'audio/'
         rescue Exception
         	@mime = nil
@@ -30,7 +31,7 @@ module Sh
 				    '.ogg' => 'audio/ogg',
 				    '.wav' => 'audio/x-wav',
 				    '.wma' => 'audio/x-ms-wma'
-				  }[File.extname @path]
+				  }[File.extname(@path)]
 				end
       end
       
@@ -57,12 +58,12 @@ module Sh
       end
 			
 			# Report on our metadata findings
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
 		
 		# Read metadata from MP3 file
-    def self.read_mp3 path, &block
+    def self.read_mp3 path
       metadata = {}
       if try_require 'mp3info'
         Mp3Info.open path do |mp3|
@@ -73,16 +74,25 @@ module Sh
           metadata[:year] = t.year.to_i
           metadata[:track_num] = t.tracknum.to_i
           metadata[:duration] = mp3.length
+
+          begin
+            if mp3.tag2 and mp3.tag2['APIC']
+              a = mp3.tag2['APIC'].last
+              a = a[1..-1].sub(/[^\0]*\0/, "")[1..-1].sub(/[^\0]*\0/, "")
+              metadata[:cover_art] = a
+            end
+          rescue
+          end
         end
       else
-        Log.info 'Please install the "mp3info" gem in order to read MP3 info'
+        Log.info 'Please install the "ruby-mp3info" gem in order to read MP3 info'
       end
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
 		
 		# Read metadata from M4A file
-    def self.read_m4a path, &block
+    def self.read_m4a path
       metadata = {}
       if try_require 'mp4info'
         mp4 = MP4Info.open path
@@ -92,35 +102,55 @@ module Sh
         metadata[:year] = mp4.DAY.to_i
         metadata[:track_num] = mp4.TRKN.first.to_i
         metadata[:duration] = mp4.SECS
+        metadata[:cover_art] = mp4.COVR if mp4.COVR
       else
-        Log.info 'Please install the "mp4info" gem in order to read M4A info'
+        Log.info 'Please install the "MP4Info" gem in order to read M4A info'
       end
       yield metadata if block
       return metadata
     end
 		
-		# Read metadata from OGG Vorbis file
-    def self.read_ogg path, &block
+		# Read metadata from Ogg Vorbis file
+    def self.read_ogg path
       metadata = {}
-      if try_require 'ogginfo'
-        OggInfo.open path do |ogg|
-          t = ogg.tag
-          metadata[:title] = t.title.to_u if t.title
-          metadata[:artist] = t.artist.to_u if t.artist
-          metadata[:album] = t.album.to_u if t.album
-          metadata[:year] = t.date.to_i
-          metadata[:track_num] = t.tracknumber.to_i
-          metadata[:duration] = ogg.length
+      if try_require 'vorbis'
+        Vorbis::Info.open path do |info|
+          dur = info.duration
+          metadata[:duration] = dur if dur and dur > 0
+
+          info.comments.each do |k, vs|
+            if vs and vs.any?
+              v = vs.first
+
+              case k
+              when 'TITLE'
+                metadata[:title] = v.to_u
+              when 'ARTIST'
+                metadata[:artist] = v.to_u
+              when 'ALBUM'
+                metadata[:album] = v.to_u
+              when 'YEAR'
+                metadata[:year] = v.to_i
+              when 'TRACKNUMBER'
+                metadata[:track_num] = v.to_i
+              when 'COVERART'
+                metadata[:cover_art] = Base64.decode64(v)
+              when 'METADATA_BLOCK_PICTURE'
+                # TODO: Support this:
+                # http://wiki.xiph.org/VorbisComment#METADATA_BLOCK_PICTURE
+              end
+            end rescue Exception
+          end
         end rescue Exception
       else
-        Log.info 'Please install the "ogginfo" gem in order to read OGG info'
+        Log.info 'Please install the "ruby-ogg" gem in order to read Vorbis info'
       end
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
 		
-		# Read metadata from FLAC file
-    def self.read_flac path, &block
+    # Read metadata from FLAC file
+    def self.read_flac path
       metadata = {}
       if try_require 'flacinfo'
         flac = FlacInfo.new(path)
@@ -142,15 +172,17 @@ module Sh
             metadata[:track_num] = value.to_i
           end
         end
+
+        #TODO: Support METADATA_BLOCK_PICTURE
       else
-        Log.info 'Please install the "flacinfo" gem in order to read FLAC info'
+        Log.info 'Please install the "flacinfo-rb" gem in order to read FLAC info'
       end
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
 		
-		# Read metadata from WMA file
-    def self.read_wma path, &block
+    # Read metadata from WMA file
+    def self.read_wma path
       metadata = {}
       if try_require 'wmainfo'
         wma = WmaInfo.new(path)
@@ -172,14 +204,14 @@ module Sh
         end
         metadata[:duration] = wma.info["playtime_seconds"]
       else
-        Log.info 'Please install the "wmainfo" gem in order to read WMA info'
+        Log.info 'Please install the "wmainfo-rb" gem in order to read WMA info'
       end
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
 		
-		# Read metadata from Wave file
-    def self.read_wave path, &block
+    # Read metadata from Wave file
+    def self.read_wave path
       metadata = {}
       if try_require 'waveinfo'
         wave = WaveInfo.new path
@@ -187,7 +219,7 @@ module Sh
       else
         Log.info 'Please install the "waveinfo" gem in order to read WAV info'
       end
-      yield metadata if block
+      yield metadata if block_given?
       return metadata
     end
   end