shroom 0.0.7 → 0.0.8

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.7'
+  s.version = '0.0.8'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'
@@ -27,16 +27,17 @@ spec = Gem::Specification.new do |s|
   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 << 'libgtk-mozembed-ruby'
-  s.requirements << 'libsqlite3-ruby'
   s.requirements << 'libglade2-ruby'
+  s.requirements << 'libgtkhtml2-ruby'
+  s.requirements << 'libsqlite3-ruby'
   # Requirements for icanhasaudio
   s.requirements << 'ruby-dev'
   s.requirements << 'libopenssl-ruby'
   s.requirements << 'libmp3lame-dev'
   s.requirements << 'libvorbis-dev'
-  s.requirements << 'make'
+  s.requirements << 'build-essential'
   s.executables = ['shroom']
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,lib,spec}/**/*")
   s.require_path = "lib"

data/lib/sh_browse.rb

@@ -55,6 +55,18 @@ module Sh
             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|

data/lib/sh_cover_art.rb

@@ -5,29 +5,32 @@ require 'cgi'
 module Sh
   class CoverArt
     def CoverArt.get_cover song
-      if Global.internet?
-        artist, album = song.artist.name, song.album.title
-        path = "#{$cover_dir}/#{artist.to_md5}_#{album.to_md5}"
-        return path if File.exists? path
+      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
+        puts doc
         if img_url
           open(path, 'w') do |output|
             open(img_url) do |input|
               output << input.read
             end
           end
-          return path
         end
       end
-      return nil
+      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}"
-      doc = REXML::Document.new(open(url).read)
+      return REXML::Document.new(open(url).read)
     end
   end
 end

data/lib/sh_database.rb

@@ -40,81 +40,86 @@ module Sh
     end
 
     def save_song song
-      # Get artist info
-      artist = song.artist
-      artist_hash = {
-        :mbid => artist.mbid,
-        :name => artist.name,
-        :image_path => artist.image_path,
-        :info => artist.info
-      }
-
-      # Insert/update artist in database
-      artist_id = nil
-      row_artist = @db[:artists][:name => artist.name]
-      if row_artist
-        artist_hash.each do |k, v|
-          if artist_hash[k] != v
-            @db[:artists].filter(:name => artist.name).update(k => v)
+      begin
+        # Get artist info
+        artist = song.artist
+        artist_hash = {
+          :mbid => artist.mbid,
+          :name => artist.name,
+          :image_path => artist.image_path,
+          :info => artist.info
+        }
+
+        # Insert/update artist in database
+        artist_id = nil
+        row_artist = @db[:artists][:name => artist.name]
+        if row_artist
+          artist_hash.each do |k, v|
+            if row_artist[k] != v
+              @db[:artists].filter(:name => artist.name).update(k => v)
+            end
           end
+          artist_id = row_artist[:id]
+        else
+          artist_id = @db[:artists].insert(artist_hash)
         end
-        artist_id = row_artist[:id]
-      else
-        artist_id = @db[:artists].insert(artist_hash)
-      end
-      artist.db_id = artist_id
-
-      # Get album info
-      album = song.album
-      album_hash = {
-        :mbid => album.mbid,
-        :title => album.title,
-        :image_path => album.image_path,
-        :date => album.date,
-        :info => album.info,
-      }
-
-      # Insert/update artist in database
-      album_id = nil
-      row_album = @db[:albums][:title => album.title]
-      if row_album
-        album_hash.each do |k, v|
-          if album_hash[k] != v
-            @db[:albums].filter(:title => album.title).update(k => v)
+        artist.db_id = artist_id
+
+        # Get album info
+        album = song.album
+        album_hash = {
+          :mbid => album.mbid,
+          :title => album.title,
+          :image_path => album.image_path,
+          :date => album.date,
+          :info => album.info,
+        }
+
+        # Insert/update artist in database
+        album_id = nil
+        row_album = @db[:albums][:title => album.title]
+        if row_album
+          album_hash.each do |k, v|
+            if row_album[k] != v
+              @db[:albums].filter(:title => album.title).update(k => v)
+            end
           end
+          album_id = row_album[:id]
+        else
+          album_id = @db[:albums].insert(album_hash)
         end
-        album_id = row_album[:id]
-      else
-        album_id = @db[:albums].insert(album_hash)
-      end
-      album.db_id = album_id
-
-      song_hash = {
-        :path => song.path,
-        :mbid => song.mbid,
-        :title => song.title,
-        :lyrics => song.lyrics,
-        :track_num => song.track_num,
-        :album_id => album_id,
-        :artist_id => artist_id
-      }
-
-      song_id = nil
-      row_song = @db[:songs][:path => song.path]
-      if row_song
-        song_hash.each do |k, v|
-          if row_song[k] != v
-            @db[:songs].filter(:path => song.path).update(k => v)
+        album.db_id = album_id
+
+        song_hash = {
+          :path => song.path,
+          :mbid => song.mbid,
+          :title => song.title,
+          :lyrics => song.lyrics,
+          :track_num => song.track_num,
+          :album_id => album_id,
+          :artist_id => artist_id
+        }
+
+        song_id = nil
+        row_song = @db[:songs][:path => song.path]
+        if row_song
+          song_hash.each do |k, v|
+            if row_song[k] != v
+              @db[:songs].filter(:path => song.path).update(k => v)
+            end
           end
+          song_id = row_song[:id]
+        else
+          song_id = @db[:songs].insert(song_hash)
+          row_song = @db[:songs][:id => song_id]
         end
-        song_id = row_song[:id]
-      else
-        song_id = @db[:songs].insert(song_hash)
-        row_song = @db[:songs][:id => song_id]
-      end
-      song.db_id = song_id
+        song.db_id = song_id
 
-      return row_song
+        return row_song
+      rescue
+        puts "Couldn's save song in database: " + song.path
+        return
+      end
     end
 
     def artists(params={})

data/lib/sh_global.rb

@@ -15,10 +15,6 @@ module Sh
     GLADE = {}
 
     def self.init
-      Thread.new do
-        recheck_internet
-      end
-
       # Won't work on Windows
       $home = ENV['HOME']
       $config_dir = "#{$home}/.shroom"
@@ -45,15 +41,6 @@ module Sh
       load_plugins
     end
 
-    def self.recheck_internet(timeout=5)
-      # Ping Google
-      @@internet = Ping.pingecho("64.233.187.99", timeout, 80)
-    end
-
-    def self.internet?
-      return @@internet
-    end
-
     def self.locate(file)
       find_in_load_path("shroom-res/#{file}") || "shroom-res/#{file}"
     end

data/lib/sh_lyrics.rb

@@ -20,7 +20,7 @@ module Sh
             "&song=#{CGI.escape(title)}"
           doc = Hpricot(open(url))
           page_url = (doc/'url').inner_text
-          page_name = page_url.match(/(:[^:]*[$])/).to_s
+          page_name = (page_url.match(/:([^:]*)$/) || ":").to_s[1..-1]
           page_name = CGI.unescape(page_name)
           page_name.freeze
           unless page_url.end_with? ';action=edit'

data/lib/sh_plasma.rb

@@ -0,0 +1,100 @@
+module Sh
+  class Plasma
+    attr_reader :width, :height, :grid_size
+
+    def initialize width, height, grid_size = 5
+      @width, @height = width.to_f, height.to_f
+  		@grid_size = grid_size.to_f
+    end
+
+    def generate_map
+      map = [[rand, rand, nil],[rand, rand, nil], nil]
+      w = @width / 2
+      h = @height / 2
+
+      while w > @grid_size or h > @grid_size
+        w /= 2
+        h /= 2
+
+        new_map = []
+        map.each_cons(2) do |row, next_row|
+          next_row ||= map.first
+
+          r = []
+          row.each_cons(2) do |v, nv|
+            nv ||= row.first
+            r << v
+            r << (v + nv) / 2
+          end
+          r << nil
+          new_map << r
+
+          r = []
+          (row.size - 1).times do |x|
+            r << (row[x] + next_row[x]) / 2
+            midpoint = nil
+            if row[x+1]
+              midpoint = (row[x] + next_row[x] + row[x+1] + next_row[x+1]) / 4
+            else
+              midpoint = (row[x] + next_row[x] + row.first + next_row.first) / 4
+            end
+            midpoint += displace(w + h)
+            midpoint = midpoint > 1 ? 1 : midpoint < 0 ? 0 : midpoint
+            r << midpoint
+          end
+          r << nil
+          new_map << r
+        end
+
+        map = new_map << nil
+      end
+      # Get rid of all the nil values introduced as part of the processing
+      map = map[0..-2].collect {|r| r[0..-2]}
+    end
+
+    def generate_pixmap color1=[0, 0, 0], color2=[65535, 65535, 65535]
+      if try_require 'gtk2'
+        depth = 24
+        begin
+          depth = Gdk::Window.default_root_window.geometry.last
+        rescue
+          depth = 24
+        end
+        pixmap = Gdk::Pixmap.new(nil, @width, @height, depth)
+        gc = Gdk::GC.new(pixmap)
+        map = generate_map
+        h = @height / map.size
+        w = @width / map.first.size
+        x = y = 0
+        map.each do |row|
+          row.each do |v|
+            r1, g1, b1 = *color1
+            r2, g2, b2 = *color2
+            # Simulate alpha transparency overlay of one colour over the other
+            red = v*r1+(1-v)*r2
+            green = v*g1+(1-v)*g2
+            blue = v*b1+(1-v)*b2
+            # Draw rectangle in pixmap
+            color = Gdk::Color.new red, green, blue
+            gc.rgb_fg_color = color
+            pixmap.draw_rectangle(gc, true, x, y, @grid_size, @grid_size)
+            # Increment horizontal position
+            x += w
+          end
+          x = 0
+          y += h
+        end
+        return pixmap
+      else
+        raise "GTK is required to create a pixmap!"
+      end
+    end
+
+    private
+    # Create random displacement value
+    def displace num
+      max = num / (@width + @height) * 3
+      return (rand - 0.5) * max
+    end
+  end
+end

data/lib/sh_queue.rb

@@ -13,7 +13,7 @@ module Sh
         'text' => 0)
       lst_tabs.append_column column
       renderer = CellRendererText.new
-      column = TreeViewColumn.new('Songs', renderer)
+      column = TreeViewColumn.new('Song', renderer)
       column.set_cell_data_func(renderer) do |tvc, cell, model, iter|
         cell.text = ''
         data = iter[1]

data/lib/sh_song.rb

@@ -40,7 +40,7 @@ module Sh
 
     def lookup!
       # Return if there is no internet connection
-      return false unless Global.internet?
+      return false unless Ping.pingecho("musicip.com", 5)
       
       begin
         track = lookup_multiple.first

data/lib/sh_tagreader.rb

@@ -45,9 +45,9 @@ module Sh
       if try_require 'mp3info'
         Mp3Info.open path do |mp3|
           t = mp3.tag
-          metadata[:title] = t.title.sanitise if t.title
-          metadata[:artist] = t.artist.sanitise if t.artist
-          metadata[:album] = t.album.sanitise if t.album
+          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.year.to_i
           metadata[:track_num] = t.tracknum.to_i
           metadata[:duration] = mp3.length
@@ -63,9 +63,9 @@ module Sh
       metadata = {}
       if try_require 'mp4info'
         mp4 = MP4Info.open path
-        metadata[:title] = mp4.NAM.sanitise if mp4.NAM
-        metadata[:artist] = mp4.ART.sanitise if mp4.ART
-        metadata[:album] = mp4.ALB.sanitise if mp4.ALB
+        metadata[:title] = mp4.NAM.to_u if mp4.NAM
+        metadata[:artist] = mp4.ART.to_u if mp4.ART
+        metadata[:album] = mp4.ALB.to_u if mp4.ALB
         metadata[:year] = mp4.DAY.to_i
         metadata[:track_num] = mp4.TRKN.first.to_i
         metadata[:duration] = mp4.SECS
@@ -81,9 +81,9 @@ module Sh
       if try_require 'ogginfo'
         OggInfo.open path do |ogg|
           t = ogg.tag
-          metadata[:title] = t.title.sanitise if t.title
-          metadata[:artist] = t.artist.sanitise if t.artist
-          metadata[:album] = t.album.sanitise if t.album
+          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
@@ -106,11 +106,11 @@ module Sh
           value = nil if value == '' or value.is_binary_data?
           case key
           when 'title'
-            metadata[:title] = value.sanitise if value
+            metadata[:title] = value.to_u if value
           when 'artist'
-            metadata[:artist] = value.sanitise if value
+            metadata[:artist] = value.to_u if value
           when 'album'
-            metadata[:album] = value.sanitise if value
+            metadata[:album] = value.to_u if value
           when 'year'
             metadata[:year] = value.to_i
           when 'tracknumber'
@@ -133,11 +133,11 @@ module Sh
           value = nil if value == '' or value.is_binary_data?
           case key
           when 'title'
-            metadata[:title] = value.sanitise if value
+            metadata[:title] = value.to_u if value
           when 'author'
-            metadata[:artist] = value.sanitise if value
+            metadata[:artist] = value.to_u if value
           when 'albumtitle'
-            metadata[:album] = value.sanitise if value
+            metadata[:album] = value.to_u if value
           when 'year'
             metadata[:year] = value.to_i
           when 'tracknumber'

data/lib/sh_util.rb

@@ -27,9 +27,16 @@ class String
     return (Digest::MD5.new << self).to_s
   end
 
-  def sanitise
+  def to_u
     begin
-      return unpack('C*').pack('U*')
+      raise "Binary data!" if is_binary_data?
+      utf8 = isutf8
+      if utf8
+        utf8 = utf8.to_s
+      else
+        utf8 = unpack('C*').pack('U*')
+      end
+      return utf8
     rescue Exception
       return nil
     end
@@ -67,7 +74,9 @@ class StringMatcher
   end
 
   def compare_ignore_case
-    compare @str1.upcase, @str2.upcase
+    @str1 = @str1.upcase
+    @str2 = @str2.upcase
+    return compare
   end
 
   private
@@ -115,6 +124,7 @@ module Kelp
         Dialog::MODAL,
         [Stock::CANCEL, Dialog::RESPONSE_NONE])
       @lbl_message = Label.new("Please wait")
+      @lbl_message.ellipsize = Pango::Layout::ELLIPSIZE_START
       vbox.pack_start @lbl_message, false, false, 8
       @progress = ProgressBar.new
       vbox.pack_start @progress, false, false, 8

data/lib/sh_view.rb

@@ -50,14 +50,18 @@ module Sh
         inc = 1 / new_songs.length.to_f
         # Enter new songs in database
         new_songs.each do |song|
-          # Show last 30 characters of path to song in the dialog
-          dialog.message = "..." + song.path[-30..-1]
+          # Show path to song in the dialog
+          dialog.message = song.path
           puts "Adding: #{song.path}"
-          # Read metadata from song tags
-          song.read_tags!
-          # Save song to the database
-          $db.save_song song
-          # Increment progress bar
+          begin
+            # Read metadata from song tags
+            song.read_tags!
+            # Save song to the database
+            $db.save_song song
+            # Increment progress bar
+          rescue
+            puts "Couldn't add song. Reason: #{$!}"
+          end
           dialog.fraction += inc
           # Make sure that the GUI is updated
           Kelp.process_events
@@ -113,6 +117,7 @@ module Sh
       vpaned.pack_start vbox, false, true, 8
       hbox = HBox.new
       lbl_song = Label.new
+      lbl_song.ellipsize = Pango::Layout::ELLIPSIZE_END
       hbox.add lbl_song
       lbl_time = Label.new(format_seconds(0) + "/" + format_seconds(0))
       hbox.pack_start lbl_time, false, false, 8
@@ -177,12 +182,12 @@ module Sh
       hpaned.add2 frm_content
 
       # === Sidebar ===
+      sidebar = VBox.new(false, 0)
+      hpaned.add1 sidebar
       sw = ScrolledWindow.new(nil, nil)
-      hpaned.add1 sw
       sw.set_policy(POLICY_AUTOMATIC, POLICY_NEVER)
       sw.width_request = 150
-      sidebar = VBox.new(false, 0)
-      sw.add_with_viewport sidebar
+      sidebar.add sw
       sto_tabs = ListStore.new(String)
       NUM_TABS.times do |tab|
         iter = sto_tabs.append
@@ -195,7 +200,7 @@ module Sh
         renderer,
         'text' => 0)
       lst_tabs.append_column column
-      sidebar.pack_start lst_tabs, true, true, 0
+      sw.add lst_tabs
       # Cover image widget
       @img_cover = Image.new
       event_box = EventBox.new
@@ -203,8 +208,11 @@ 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
-      @img_cover.height_request = 150
-      sidebar.pack_start event_box, false, false, 0
+      @img_cover.height_request = 128
+      @img_cover.width_request = 128
+      bx = HBox.new false, 0
+      bx.pack_start event_box, false, false, 16
+      sidebar.pack_start bx, false, false, 16
       # Lyrics text view
       @html_lyrics = HtmlView.new
       scr_lyrics = ScrolledWindow.new(nil, nil)
@@ -436,25 +444,29 @@ module Sh
           rescue
             @pixbuf = nil
           end
+
           if @pixbuf
             @note.pixbuf_icon = @pixbuf.scale(48, 48) if @rnotify
-            @img_cover.pixbuf = @pixbuf.scale(132, 132)
+            @img_cover.pixbuf = @pixbuf.scale(128, 128)
           else
             @img_cover.pixbuf = Gdk::Pixbuf.new(Global.locate("cover_unavailable.png")).scale(132, 132)
             Thread.new do
               song.album.image_path = Sh::CoverArt.get_cover(song)
-              $db.save_song song
-              # Show cover unless requests have been shuffled
-              if song == @player.song
-                @pixbuf = nil
-                (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
-                if @pixbuf
-                  if @rnotify
-                    @note.close
-                    @note.pixbuf_icon = @pixbuf.scale(48, 48)
-                    @note.show
+              if song.album.image_path
+                $db.save_song song
+                # Show cover unless requests have been shuffled
+                if song == @player.song
+                  @pixbuf = nil
+                  (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
+                  if @pixbuf
+                    if @rnotify
+                      @note.close
+                      @note.pixbuf_icon = @pixbuf.scale(48, 48)
+                      @note.show
+                    end
+                    @img_cover.pixbuf = @pixbuf.scale(128, 128)
+                    plasmarize_background @pixbuf
                   end
-                  @img_cover.pixbuf = @pixbuf.scale(132, 132)
                 end
               end
             end
@@ -507,6 +519,39 @@ module Sh
       end
     end
 
+    def plasmarize_background image_path
+      begin
+        pixbuf = nil
+        if image_path.is_a? Gdk::Pixbuf
+          pixbuf = image_path
+        elsif image_path.respond_to? :to_str
+          pixbuf = Gdk::Pixbuf.new image_path.to_str
+        else
+          raise ArgumentError
+        end
+
+        if pixbuf
+          # 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)}
+
+          # If the color has changed, regenerate plasma background
+          if color != @plasma_color
+            @plasma_color = color.dup
+            require 'sh_plasma'
+            pixmap = Plasma.new(600, 600, 3).generate_pixmap(color)
+            style = @window.style.copy
+            style.set_bg_pixmap(Gtk::STATE_NORMAL, pixmap)
+            @window.set_style style
+          end
+        end
+      rescue
+        puts "Plasma fail: #{$!}"
+      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.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 +10:00
+date: 2009-08-29 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - lib/sh_plugin.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
@@ -173,15 +174,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: 
 - rake
+- libwxgtk2.8-0
 - libgnome2-ruby
-- libgtk-mozembed-ruby
-- libsqlite3-ruby
 - libglade2-ruby
+- libgtkhtml2-ruby
+- libsqlite3-ruby
 - ruby-dev
 - libopenssl-ruby
 - libmp3lame-dev
 - libvorbis-dev
-- make
+- build-essential
 rubyforge_project: shroom
 rubygems_version: 1.3.1
 signing_key: