shroom 0.0.8 → 0.0.9

data/Rakefile

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

data/lib/sh_browse.rb

@@ -49,7 +49,7 @@ module Sh
             selected_rows = selection.selected_rows
           end
 
-          puts selected_rows
+          #puts selected_rows
 
           if data.is_a? Sh::Song
             song = data

data/lib/sh_cover_art.rb

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

data/lib/sh_lyrics.rb

@@ -7,55 +7,62 @@ module Sh
   class Lyrics
     def Lyrics.get_lyrics song
       artist, title = song.artist.name, song.title
-      return nil unless artist and title
-      LyricsWiki.get_lyrics(artist, title)
-    end
-
-    class LyricsWiki
-      def LyricsWiki.get_lyrics(artist, title)
-        lyrics = nil
-        if Ping.pingecho("lyricwiki.org", 10)
-          url = "http://lyricwiki.org/api.php?func=getSong&fmt=xml" +
-            "&artist=#{CGI.escape(artist)}" +
-            "&song=#{CGI.escape(title)}"
-          doc = Hpricot(open(url))
-          page_url = (doc/'url').inner_text
-          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'
-            doc = Hpricot(open(page_url).read.gsub(/<[\s]*br[\s]*\/?>/, "\n"))
-            versions = []
-            lyricboxes = doc/'div.lyricbox'
-            best_match = [0, lyricboxes.first.inner_text.strip]
-            if lyricboxes.size > 1 and StringMatcher.compare_ignore_case(page_name, title) < 0.9
-              lyricboxes.each do |box|
-                prev = box.previous
-                version = nil
-                while prev
-                  unless (prev/'.mw-headline').empty?
-                    version = prev.inner_text.strip
-                    break
-                  end
-                  prev = prev.previous
-                end
-                version.sub! /^\[edit\] /, ''
-                lyrics = box.inner_text.strip
-                versions << [version, lyrics]
-              end
-              versions.each do |version, lyrics|
-                version_title = page_name.dup
-                version_title << " (#{version})" if version
-                match = [StringMatcher.compare_ignore_case(version_title, title), lyrics]
-                best_match = match if match.first > best_match.first
-              end
-            end
-            lyrics = best_match[1]
-          end
-        end
-        return lyrics
+      lyrics = nil
+      if artist and title
+        url = "http://lyrical.heroku.com/api?format=plain"
+        url << "&artist=#{CGI.escape(artist)}"
+        url << "&song=#{CGI.escape(title)}"
+        lyrics = open(url).read
+        lyrics = nil if lyrics.empty?
       end
+      return lyrics
     end
+
+#    class LyricsWiki
+#      def LyricsWiki.get_lyrics(artist, title)
+#        lyrics = nil
+#        if Ping.pingecho("lyricwiki.org", 10)
+#          url = "http://lyricwiki.org/api.php?func=getSong&fmt=xml" +
+#            "&artist=#{CGI.escape(artist)}" +
+#            "&song=#{CGI.escape(title)}"
+#          doc = Hpricot(open(url))
+#          page_url = (doc/'url').inner_text
+#          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'
+#            doc = Hpricot(open(page_url).read.gsub(/<[\s]*br[\s]*\/?>/, "\n"))
+#            versions = []
+#            lyricboxes = doc/'div.lyricbox'
+#            best_match = [0, lyricboxes.first.inner_text.strip]
+#            if lyricboxes.size > 1 and StringMatcher.compare_ignore_case(page_name, title) < 0.9
+#              lyricboxes.each do |box|
+#                prev = box.previous
+#                version = nil
+#                while prev
+#                  unless (prev/'.mw-headline').empty?
+#                    version = prev.inner_text.strip
+#                    break
+#                  end
+#                  prev = prev.previous
+#                end
+#                version.sub! /^\[edit\] /, ''
+#                lyrics = box.inner_text.strip
+#                versions << [version, lyrics]
+#              end
+#              versions.each do |version, lyrics|
+#                version_title = page_name.dup
+#                version_title << " (#{version})" if version
+#                match = [StringMatcher.compare_ignore_case(version_title, title), lyrics]
+#                best_match = match if match.first > best_match.first
+#              end
+#            end
+#            lyrics = best_match[1]
+#          end
+#        end
+#        return lyrics
+#      end
+#    end
   end
 end
 

data/lib/sh_util.rb

@@ -63,6 +63,7 @@ class StringMatcher
   end
 
   def compare
+    return 1 if @str1 == @str2
     pairs1 = word_letter_pairs @str1
     pairs2 = word_letter_pairs @str2
     union = pairs1.size + pairs2.size

data/lib/sh_view.rb

@@ -507,7 +507,11 @@ module Sh
         <p></p><a href="#reload">Reload lyrics</a>
         }
       end
-      @html_lyrics.document.signal_connect('link-clicked') do |doc, loc|
+      doc = @html_lyrics.document
+      if @html_signal_id and doc.signal_handler_is_connected?(@html_signal_id)
+        doc.signal_handler_disconnect(@html_signal_id)
+      end
+      @html_signal_id = doc.signal_connect('link-clicked') do |doc, loc|
         if loc == '#reload'
           @html_lyrics.set_html 'Loading...'
           Thread.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 +10:00
+date: 2009-09-15 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency