shroom 0.0.10 → 0.0.11

data/lib/sh_playlist.rb

@@ -8,19 +8,23 @@ module Sh
     end
 
     def self.parse(path)
-      list = Playlist.new path.match(/\/([^\/]*)$/).captures.last
+      list = Playlist.new File.basename(path)
       open(path) do |f|
         while line = f.gets
           line.strip!
           unless line[0] == ?# or line.empty?
-          	# TODO: make cross-platform
-            ref = File.expand_path(line.gsub('\\', '/'), File.dirname(path))
-            if File.exists? ref
-              if Sh::Global::SUPPORTED_EXTENSIONS.include? File.extname(ref)
-                list << ($db.songs(:path => ref).first || Sh::Song.new(ref).read_tags!)
+            begin
+              # TODO: make cross-platform
+              ref = File.expand_path(line.gsub('\\', '/'), File.dirname(path))
+              if File.exists? ref
+                if Global::SUPPORTED_EXTENSIONS.include? File.extname(ref)
+                  list << (Song.first(:path => ref) || Database.add_song(ref))
+                end
+              else
+                Log.info "File at #{ref} not found"
               end
-            else
-              Sh::Log.info "File at #{ref} not found"
+            rescue Exception
+              Log.info "Couldn't parse line in playlist: #{line}", $!
             end
           end
         end
@@ -37,7 +41,7 @@ module Sh
     end
     
     def save!
-    	path = Sh::Global::PATHS[:playlists_file]
+    	path = Global::PATHS[:playlists_file]
     	playlists = []
     	if File.exists? path
     		playlists = YAML.load_file path
@@ -83,8 +87,8 @@ module Sh
 		      playlist = Playlist.new name
 		      paths.each do |path|
 		      	if File.exists? path
-		          if Sh::Global::SUPPORTED_EXTENSIONS.include? File.extname(path)
-		            song = ($db.songs(:path => path).first || Sh::Song.new(path).read_tags!)
+		          if Global::SUPPORTED_EXTENSIONS.include? File.extname(path)
+		            song = (Song.first(:path => path) || Database.add_song(path))
 		      			playlist << song
 		          end
 		        else

data/lib/sh_util.rb

@@ -65,23 +65,6 @@ class String
   end
 end
 
-require 'thread'
-require 'gtkhtml2'
-module Gtk
-  class HtmlView
-    def set_html content=nil
-      @doc_mutex ||= Mutex.new
-      doc = self.document ||= HtmlDocument.new
-      @doc_mutex.synchronize do
-        doc.open_stream 'text/html'
-        content ||= (yield || '')
-        doc.write_stream content
-        doc.close_stream
-      end
-    end
-  end
-end
-
 module Kelp
   class ProgressDialog < Gtk::Dialog
     def initialize(title)

data/lib/sh_view.rb

@@ -7,7 +7,6 @@ require 'sh_cover_art'
 require 'sh_mmkeys'
 require 'sh_actions'
 require 'gtk2'
-require 'gtkhtml2'
 include Gtk
 
 module Sh
@@ -24,7 +23,7 @@ module Sh
     @@instance = nil
 
     def initialize
-      Sh::Log.warning 'Instance of Browse already created!' if @@instance
+      Log.warning 'Instance of View already created!' if @@instance
     	@@instance = self
       
       # Initialize GTK
@@ -38,38 +37,40 @@ module Sh
 
       # Search for songs in library directory if it exists
       if File.exists? Global.prefs[:library_dir]
-        cancelled = false
         # Prepare progress dialog
         dialog = Kelp::ProgressDialog.new("Updating database...")
+        cancelled = false
         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|
           ext = File.extname path
-          if Sh::Global::SUPPORTED_EXTENSIONS.include? ext
-            new_songs << Song.new(path) unless $db.contains? path
+          if Global::SUPPORTED_EXTENSIONS.include? ext
+            new_songs << path if Song.first(:path => path).nil?
           end
         end
+
         # Show progress dialog if there are new songs to process
         if new_songs.length > 0
           dialog.show_all
           Kelp.process_events
         end
+
         # inc = the fraction to increment the progress bar by for each song
         inc = 1 / new_songs.length.to_f
+
         # Enter new songs in database
-        new_songs.each do |song|
+        new_songs.each do |path|
           # Show path to song in the dialog
-          dialog.message = song.path
+          dialog.message = path
           
           begin
-            # Read metadata from song tags
-            song.read_tags!
             # Save song to the database
-            $db.save_song song
-            Sh::Log.debug "Added #{song.path} to database"
+            Database.add_song path
+            Log.debug "Added #{path} to database"
           rescue
-            Sh::Log.info "Failed to add ${song.path} to database", $!
+            Log.info "Failed to add ${path} to database", $!
           end
           # Increment progress bar
           dialog.fraction += inc
@@ -82,7 +83,10 @@ module Sh
         # Remove old entries from database
         dialog.message = "Cleaning out old entries..."
         dialog.pulse
-        $db.clean
+
+        Song.clean_missing_songs
+        Album.clean_empty_albums
+        Artist.clean_empty_artists
 
         # Destroy progress dialog
         dialog.destroy
@@ -91,7 +95,7 @@ module Sh
         new_songs = dialog = nil
       end
       
-      Sh::Log.debug 'Synchronized library dir with database'
+      Log.debug 'Synchronized library dir with database'
 
       # Load small 16x16 pixel Shroom logo
       icon = Gdk::Pixbuf.new Global.locate('icon_16x16.png')
@@ -226,10 +230,15 @@ module Sh
       bx.pack_start event_box, false, false, 16
       sidebar.pack_start bx, false, false, 16
       # Lyrics text view
-      @html_lyrics = HtmlView.new
+      @txt_lyrics = TextView.new
+      @txt_lyrics.editable = false
+      @txt_lyrics.cursor_visible = false
+      @txt_lyrics.left_margin = @txt_lyrics.right_margin = 8
       scr_lyrics = ScrolledWindow.new(nil, nil)
       scr_lyrics.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-      scr_lyrics.add @html_lyrics
+      scr_lyrics.add @txt_lyrics
+      @buf_lyrics = @txt_lyrics.buffer
+      @buf_lyrics.create_tag 'title', 'font' => 'Sans 18'
       box_lyrics = VBox.new false, 0
       box_lyrics.add scr_lyrics
       @btn_refresh_lyrics = Button.new Stock::REFRESH
@@ -462,7 +471,7 @@ module Sh
     def on_song_changed
       if @player
         song = @player.song
-        Sh::Log.debug "Playback started for \"#{song.title}\""
+        Log.debug "Playback started for \"#{song.title}\""
         @note.close if @note
         @note = nil
         if @rnotify
@@ -475,11 +484,11 @@ module Sh
         Thread.new {update_image song} if Global.prefs[:cover_art]
         # Lyrics
         if Global.prefs[:lyrics]
-          @html_lyrics.set_html 'Loading...'
+          @buf_lyrics.text = 'Loading...'
           Thread.new do
             if not song.lyrics
-              song.lyrics = Sh::Lyrics.get_lyrics(song)
-              $db.save_song song
+              song.lyrics = Lyrics.get_lyrics(song)
+              song.save
             end
             # Show lyrics unless requests have been shuffled
             if @player.song == song
@@ -501,20 +510,23 @@ module Sh
       lyrics = song.lyrics || "[Lyrics not found]"
       # Stupid character encoding stuff
       lyrics = lyrics.unpack('U*').pack('C*')
-      @html_lyrics.set_html do
-        %{
-        <h2>#{song.title}</h2>
-        <pre style='font-family: sans-serif;'>#{lyrics}</pre>
-        }
-      end
-      if @html_signal_id and @btn_refresh_lyrics.signal_handler_is_connected?(@html_signal_id)
-        @btn_refresh_lyrics.signal_handler_disconnect(@html_signal_id)
+
+      @buf_lyrics.text = ""
+      last = @buf_lyrics.get_iter_at_offset(0)
+      @buf_lyrics.insert last, song.title
+      start = last.clone
+      start.backward_chars(song.title.length)
+      @buf_lyrics.apply_tag('title', start, last)
+      @buf_lyrics.insert last, "\n\n#{lyrics}"
+
+      if @lyric_signal_id and @btn_refresh_lyrics.signal_handler_is_connected?(@lyric_signal_id)
+        @btn_refresh_lyrics.signal_handler_disconnect(@lyric_signal_id)
       end
-      @html_signal_id = @btn_refresh_lyrics.signal_connect('pressed') do |*args|
-        @html_lyrics.set_html 'Loading...'
+      @lyric_signal_id = @btn_refresh_lyrics.signal_connect('pressed') do |*args|
+        @buf_lyrics.text = 'Loading...'
         Thread.new do
           song.lyrics = Sh::Lyrics.get_lyrics(song)
-          $db.save_song song
+          song.save
           show_lyrics song if @player and @player.song == song
         end
       end
@@ -534,7 +546,7 @@ module Sh
           begin
             @pixbuf = Gdk::Pixbuf.new(image_path)
             song.album.image_path = image_path
-            $db.save_song song
+            song.album.save
           rescue
           end
         end
@@ -661,7 +673,7 @@ module Sh
     end
 
     def show
-    	Sh::Log.debug 'Starting GTK main loop'
+    	Log.debug 'Starting GTK main loop'
       Gtk.main
     end
 

data/lib/shroom-res/plugins/lastfm_scrobbler.rb

@@ -68,47 +68,49 @@ Sh::Plugin.define "lastfm_scrobbler" do
         :track_number => song.track_num
       }
 
-      # Scrobble if Audioscrobbler is reachable
-      submit_scrobbles! if Ping.pingecho("post.audioscrobbler.com", 10)
+      # Scrobble
+      submit_scrobbles!
     end
   end
 
   def submit_scrobbles!
     (@mutex ||= Mutex.new).synchronize do
-      auth = @scrobble_auth
-      if not auth or auth.status.strip.upcase != 'OK'
-        begin
-          details = {:user => @user, :password => @password}
-          auth = @scrobble_auth = Scrobbler::SimpleAuth.new(details)
-          auth.handshake!
-          Sh::Log.debug "Last.fm authentication status is \"#{auth.status}\""
-        rescue
-        end
-      end
-
-      # No point attempting to scrobble without authentication
-      if auth.status and auth.status.strip.upcase == 'OK'
-        failed_scrobbles = []
-        until @scrobble_queue.empty?
-          hash = @scrobble_queue.pop
-          hash[:session_id] = auth.session_id
-          hash[:submission_url] = auth.submission_url
-          scrobble = nil
+      if Ping.pingecho("post.audioscrobbler.com", 5)
+        auth = @scrobble_auth
+        if not auth or auth.status.strip.upcase != 'OK'
           begin
-            scrobble = Scrobbler::Scrobble.new(hash)
-            scrobble.submit!
+            details = {:user => @user, :password => @password}
+            auth = @scrobble_auth = Scrobbler::SimpleAuth.new(details)
+            auth.handshake!
+            Sh::Log.debug "Last.fm authentication status is \"#{auth.status}\""
           rescue
-            scrobble = nil
           end
+        end
+
+        # No point attempting to scrobble without authentication
+        if auth.status and auth.status.strip.upcase == 'OK'
+          failed_scrobbles = []
+          until @scrobble_queue.empty?
+            hash = @scrobble_queue.pop
+            hash[:session_id] = auth.session_id
+            hash[:submission_url] = auth.submission_url
+            scrobble = nil
+            begin
+              scrobble = Scrobbler::Scrobble.new(hash)
+              scrobble.submit!
+            rescue
+              scrobble = nil
+            end
 
-          if scrobble and scrobble.status.strip.upcase == 'OK'
-            Sh::Log.debug "Scrobble for \"#{scrobble.track}\" succeeded"
-          else
-            Sh::Log.info "Failed to scrobble for \"#{scrobble.track}\""
-            failed_scrobbles.insert 0, hash
+            if scrobble and scrobble.status.strip.upcase == 'OK'
+              Sh::Log.debug "Scrobble for \"#{scrobble.track}\" succeeded"
+            else
+              Sh::Log.info "Failed to scrobble for \"#{scrobble.track}\""
+              failed_scrobbles.insert 0, hash
+            end
           end
+          @scrobble_queue.push *failed_scrobbles
         end
-        @scrobble_queue.push *failed_scrobbles
       end
     end
   end

data/lib/shroom-res/shroom.glade

@@ -131,7 +131,7 @@
               </widget>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">3</property>
+                <property name="right_attach">2</property>
                 <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                 <property name="y_options"></property>
               </packing>
@@ -285,6 +285,18 @@
                 <property name="bottom_attach">4</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkSpinButton" id="spn_track_num">
+                <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>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+              </packing>
+            </child>
             <child>
               <placeholder/>
             </child>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 +10:00
+date: 2009-10-06 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,16 +102,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: shared-mime-info
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.1"
-    version: 
 description: Shroom is a music player and organizer
 email: dismal.denizen@gmail.com
 executables: 
@@ -130,11 +120,8 @@ files:
 - lib/sh_browse.rb
 - lib/sh_main.rb
 - lib/sh_queue.rb
-- lib/sh_album.rb
 - lib/sh_playlist.rb
 - lib/sh_cover_browse.rb
-- lib/sh_song.rb
-- lib/sh_artist.rb
 - lib/sh_actions.rb
 - lib/sh_plugin.rb
 - lib/sh_log.rb
@@ -145,15 +132,14 @@ files:
 - lib/sh_database.rb
 - lib/sh_util.rb
 - lib/sh_mmkeys.rb
+- 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.svg
 - lib/shroom-res/icon_128x128.png
 - lib/shroom-res/shroom.glade
-- lib/shroom-res/cover_unavailable.svg
 - lib/sh_player.rb
 - lib/sh_view.rb
 has_rdoc: true
@@ -180,10 +166,9 @@ requirements:
 - libwxgtk2.8-0
 - libgnome2-ruby
 - libglade2-ruby
-- libgtkhtml2-ruby
 - libsqlite3-ruby
-- ruby-dev
 - libopenssl-ruby
+- ruby-dev
 - libmp3lame-dev
 - libvorbis-dev
 - build-essential

data/lib/sh_album.rb

@@ -1,14 +0,0 @@
-module Sh
-  class Album
-    attr_accessor :title, :mbid, :image_path, :info, :date
-    attr_accessor :db_id
-
-    def initialize
-      @songs = []
-    end
-
-    def to_s
-      return self.title
-    end
-  end
-end