shroom 0.0.11 → 0.0.12

data/lib/sh_util.rb

@@ -13,11 +13,10 @@ class Object
   end
 
   def find_in_load_path(file)
-    $:.each do |path|
-      abs_file = "#{path}/#{file}"
-      return abs_file if File.exists? abs_file
+    $:.reverse.each do |path|
+      joined = File.join(path, file)
+      return joined if File.exists?(joined)
     end
-    return nil
   end
 end
 
@@ -50,6 +49,7 @@ module Rest
 end
 
 require 'digest/md5'
+require 'cgi'
 class String
   def to_md5
     return (Digest::MD5.new << self).to_s
@@ -63,6 +63,19 @@ class String
       return utf8 ? utf8.to_s : unpack('C*').pack('U*')
     end
   end
+
+  def unescape_html
+    entities = {
+      "&quot;" => "\"",
+      "&apos;" => "'",
+      "&amp;" => "&",
+      "&lt;" => "<",
+      "&gt;" => ">",
+      "&nbsp;" => " "
+    }
+
+    return CGI.unescapeHTML(self.gsub(/&\w*;/) {|e| entities[e] || e})
+  end
 end
 
 module Kelp

data/lib/sh_view.rb

@@ -1,9 +1,11 @@
+require 'find'
+
 require 'sh_browse'
 require 'sh_cover_browse'
 require 'sh_queue'
 require 'sh_playlist'
 require 'sh_lyrics'
-require 'sh_cover_art'
+require 'sh_lastfm'
 require 'sh_mmkeys'
 require 'sh_actions'
 require 'gtk2'
@@ -25,6 +27,8 @@ module Sh
     def initialize
       Log.warning 'Instance of View already created!' if @@instance
     	@@instance = self
+
+      GLib.application_name = "Shroom"
       
       # Initialize GTK
       Gtk.init
@@ -40,11 +44,11 @@ module Sh
         # Prepare progress dialog
         dialog = Kelp::ProgressDialog.new("Updating database...")
         cancelled = false
-        dialog.signal_connect('response') { cancelled = true}
+        dialog.signal_connect('response') { cancelled = true }
 
         # Scan for new songs which are not in the database
         new_songs = []
-        Dir[Global.prefs[:library_dir]+'/**/*'].each do |path|
+        Find.find(Global.prefs[:library_dir]) do |path|
           ext = File.extname path
           if Global::SUPPORTED_EXTENSIONS.include? ext
             new_songs << path if Song.first(:path => path).nil?
@@ -73,7 +77,8 @@ module Sh
             Log.info "Failed to add ${path} to database", $!
           end
           # Increment progress bar
-          dialog.fraction += inc
+          frac = dialog.fraction + inc
+          dialog.fraction = frac > 1 ? 1 : frac
           # Make sure that the GUI is updated
           Kelp.process_events
           # Stop adding songs if process is cancelled by the user
@@ -153,6 +158,7 @@ module Sh
       btn_next.add Image.new Stock::MEDIA_NEXT, IconSize::SMALL_TOOLBAR
       box_controls.pack_start btn_next, false, true, 0
 
+      # Allow user to seek using the slider
       seeker.signal_connect('change_value') do |range, scroll, value|
         if @player
           seeker.value = value if value < 0.999
@@ -162,19 +168,24 @@ module Sh
           seeker.value = 0
         end
       end
+
       GLib::Timeout.add(100) do
         if @player
+          # Update slider and time label according to position in song
           pos = @player.position.to_f
           seeker.value = pos / @player.duration
           lbl_time.text = format_seconds(pos) + "/" + format_seconds(@player.duration)
+          # Ensure label shows title of currently playing song
           lbl_song.set_markup @player.song.to_html
         else
+          # No song is playing or paused, reflect this on display
           seeker.value = 0
           lbl_time.text = format_seconds(0) + "/" + format_seconds(0)
           lbl_song.set_markup "<b>Not playing</b>"
         end
         true
       end
+
       @btn_play.signal_connect('clicked') do |toggle|
         if toggle.active?
           @player.play
@@ -224,6 +235,22 @@ module Sh
       event_box.signal_connect('button-press-event') do |w, event|
         Kelp::ImageDialog.new(@pixbuf, @player.song.album.title).show if @pixbuf and @player
       end
+      #FIXME
+      Drag.dest_set(event_box, 0, [], 0)
+      event_box.signal_connect('drag-data-received') do |w, dc, x, y, data, info, time|
+        p data
+        dc.drop_finish(true, time)
+        true
+      end
+      event_box.signal_connect('drag-motion') do |w, dc, x, y, time|
+        dc.drag_status(Gdk::DragContext::ACTION_COPY, time)
+        true
+      end
+      event_box.signal_connect('drag-drop') do |w, dc, x, y, time|
+        Drag.get_data(w, dc, dc.targets.last, time)
+        true
+      end
+      # END FIXME
       @img_cover.height_request = 128
       @img_cover.width_request = 128
       bx = HBox.new false, 0
@@ -244,7 +271,7 @@ module Sh
       @btn_refresh_lyrics = Button.new Stock::REFRESH
       box_lyrics.pack_start @btn_refresh_lyrics, false, false
       queue = Sh::Queue.new self
-      browse = Sh::Browse.new self
+      @browse = Sh::Browse.new self
       cover_browse = Sh::CoverBrowse.new self
       playlists = Sh::Playlists.new self
       lst_tabs.selection.signal_connect('changed') do |selection|
@@ -254,7 +281,7 @@ module Sh
           frm_content.child = queue.widget
           queue.update
         when TAB_BROWSE
-          frm_content.child = browse.widget
+          frm_content.child = @browse.widget
         when TAB_LYRICS
           frm_content.child = box_lyrics
         when TAB_COVER_BROWSE
@@ -309,7 +336,7 @@ module Sh
         ['/File/sep1', '<Separator>', nil, nil, lambda {}],
         ['/File/Quit', '<StockItem>', '<control>Q', Stock::QUIT, lambda {Gtk.main_quit}],
         ['/_Edit'],
-        ['/Edit/Plugins...', '<StockItem>', nil, Stock::DISCONNECT, lambda {show_plugins}],
+        ['/Edit/Plugins...', '<ImageItem>', nil, Gdk::Pixbuf.new(Global.locate('plugin.png')), lambda {show_plugins}],
         ['/Edit/Preferences...', '<StockItem>', nil, Stock::PREFERENCES, lambda {show_preferences}],
         ['/_Help'],
         ['/Help/About', '<StockItem>', nil, Stock::ABOUT, lambda {show_about}]
@@ -442,16 +469,18 @@ module Sh
     end
 
     def show_about
-      version = '0.0.0'
+      version = Gem::Version.new('')
       Gem::SourceIndex.from_installed_gems.each do |n, spec|
-        version = spec.version.to_s if spec.name == 'shroom'
-      end
-      dlg_about = Gnome::About.new('Shroom', version,
-        "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_128x128.png'))
-      dlg_about.show
+        ver = spec.version
+        version = ver if spec.name == 'shroom' and ver > version
+      end
+      AboutDialog.show(@window, {
+          :version => version.to_s,
+          :logo => Gdk::Pixbuf.new(Global.locate('icon_128x128.png')),
+          :license => open(Global.locate('license.txt')).read,
+          :copyright => "Copyright (C) 2009 Aiden Nibali",
+          :authors => ["Aiden Nibali"]
+        })
     end
 
     def prepare_song
@@ -508,8 +537,6 @@ module Sh
 
     def show_lyrics song
       lyrics = song.lyrics || "[Lyrics not found]"
-      # Stupid character encoding stuff
-      lyrics = lyrics.unpack('U*').pack('C*')
 
       @buf_lyrics.text = ""
       last = @buf_lyrics.get_iter_at_offset(0)
@@ -533,21 +560,54 @@ module Sh
     end
 
     def update_image song
-      image_path = song.album.image_path
-      # Use image path in database if valid
+      @img_cover.width_request = 128
+      @img_cover.height_request = 128
+
+      image_path = song.image_path
+      # Use image path for song if valid
       if image_path and File.size? image_path
         (@pixbuf = Gdk::Pixbuf.new(image_path)) rescue Exception
       end
+
+      if @pixbuf.nil?
+        image_path = song.album.image_path
+        # Use image path for album if valid
+        if image_path and File.size? image_path
+          (@pixbuf = Gdk::Pixbuf.new(image_path)) rescue Exception
+        end
+      end
+
       # Lookup cover art on Internet if necessary
-      unless @pixbuf
+      if @pixbuf.nil?
         @img_cover.pixbuf = Gdk::Pixbuf.new(Global.locate("cover_unavailable.png")).scale(132, 132)
-        image_path = Sh::CoverArt.get_cover(song)
-        if image_path
-          begin
-            @pixbuf = Gdk::Pixbuf.new(image_path)
-            song.album.image_path = image_path
-            song.album.save
-          rescue
+        # Get album cover art from Last.fm
+        LastFM.get_album_info song.album
+
+        if song.album.image_path
+          (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
+        end
+
+        unless @pixbuf
+          unless song.artist.image_path
+            LastFM.get_artist_info song.artist
+          end
+
+          if song.artist.image_path
+            begin
+              pixbuf = Gdk::Pixbuf.new(song.artist.image_path)
+              r = pixbuf.width.to_f / pixbuf.height
+              if r > 1
+                pixbuf = pixbuf.scale(132, 132 / r)
+                @img_cover.width_request = 128
+                @img_cover.height_request = 128 / r
+              else
+                pixbuf = pixbuf.scale(132 * r, 132)
+                @img_cover.width_request = 128 * r
+                @img_cover.height_request = 128
+              end
+              @img_cover.pixbuf = pixbuf
+            rescue Exception
+            end
           end
         end
       end
@@ -579,8 +639,10 @@ module Sh
           # Get color by shrinking image to 1px and extracting RGB values
           color = pixbuf.scale(1, 1, Gdk::Pixbuf::INTERP_NEAREST).pixels.unpack("CCC")
           # Convert colour from values between 0 and 255 to values between
-          # 0 and 65535.
-          color.map! {|n| n * (65535 / 255)}
+          # 0 and 65535 (257 = 65535 / 255).
+          color.map! {|n| n * 257}
+          # Ensure that the colour isn't too dark
+          color.map! {|n| n < 20 ? n + 20 : n}
 
           # If the color has changed, regenerate plasma background
           if color != @plasma_color
@@ -593,22 +655,29 @@ module Sh
           end
         end
       rescue
-      	Sh::Log.info "Plasma generation failed", $!
+      	Log.info "Plasma generation failed", $!
       end
     end
 
     public
+    def update_song song
+      @browse.update_song(song) do |s|
+        new_song = yield s
+        song = new_song if new_song.is_a? Song
+      end
+    end
+
     def queue
       return @queue
     end
 
-    def queue=(queue)
-      @queue_pos = 0
+    def set_queue queue, pos=0
+      @queue_pos = pos
       @queue = queue
       prepare_song
     end
 
-    def queue_pos=(pos)
+    def set_queue_pos pos
       @queue_pos = pos
       prepare_song
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 +11:00
+date: 2009-11-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: 0.3.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-ogginfo
+  name: ruby-ogg
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: flacinfo-rb
@@ -125,25 +125,28 @@ files:
 - lib/sh_actions.rb
 - lib/sh_plugin.rb
 - lib/sh_log.rb
-- lib/sh_cover_art.rb
 - lib/sh_tagreader.rb
 - lib/sh_plasma.rb
 - lib/sh_lyrics.rb
 - lib/sh_database.rb
 - lib/sh_util.rb
 - lib/sh_mmkeys.rb
+- lib/res/shroom_resources_signpost
+- lib/res/cover_unavailable.png
+- lib/res/license.txt
+- lib/res/icon_16x16.png
+- lib/res/plugins/lastfm_scrobbler.rb
+- lib/res/icon_128x128.png
+- lib/res/shroom.glade
+- lib/res/plugin.png
 - lib/sh_fingerprint.rb
-- lib/shroom-res
-- lib/shroom-res/cover_unavailable.png
-- lib/shroom-res/icon_16x16.png
-- lib/shroom-res/plugins
-- lib/shroom-res/plugins/lastfm_scrobbler.rb
-- lib/shroom-res/icon_128x128.png
-- lib/shroom-res/shroom.glade
+- lib/sh_lastfm.rb
 - lib/sh_player.rb
 - lib/sh_view.rb
 has_rdoc: true
 homepage: http://shroom.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -162,20 +165,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- rake
 - libwxgtk2.8-0
-- libgnome2-ruby
+- libgtk2-ruby
 - libglade2-ruby
 - libsqlite3-ruby
 - libopenssl-ruby
+- libofa0
 - ruby-dev
 - libmp3lame-dev
 - libvorbis-dev
 - build-essential
 rubyforge_project: shroom
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Shroom is a music player and organizer
 test_files: []
 

data/lib/sh_cover_art.rb

@@ -1,26 +0,0 @@
-require 'rexml/document'
-
-module Sh
-  class CoverArt
-    def self.get_cover song
-      artist, album = song.artist.name, song.album.title
-      if artist and album
-        @lastfm_rest ||= Rest::Get.new("http://ws.audioscrobbler.com/2.0",
-          :api_key => Sh::KEYS[:lastfm], :method => "album.getInfo")
-        path = "#{Global::PATHS[:cover_dir]}/#{artist.to_md5}_#{album.to_md5}"
-        if File.exists? path and File.size?(path) > 0
-          return path
-        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|
-              output << open(img_url).read
-            end
-          end
-        end
-        return path if File.exists? path
-      end
-    end
-  end
-end