rhythmbox r6230 - in trunk: . plugins/artdisplay/artdisplay

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Mar 19 11:45:20 2009
New Revision: 6230
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6230&view=rev

Log:
2009-03-19  Jonathan Matthew  <jonathan d14n org>

	* plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py:
	Add daap to the set of URI schemes to ignore, fix some other typos.


Modified:
   trunk/ChangeLog
   trunk/plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py

Modified: trunk/plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py
==============================================================================
--- trunk/plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py	(original)
+++ trunk/plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py	Thu Mar 19 11:45:20 2009
@@ -72,7 +72,7 @@
 	def search (self, db, entry, on_search_completed_cb, *args):
 
 		self.file = gio.File(entry.get_playback_uri())
-		if self.file.get_uri_scheme() in ('http','cdda'):
+		if self.file.get_uri_scheme() in ('http','cdda','daap'):
 			print 'not searching for local art for %s' % (self.file.get_uri())
 			on_search_completed_cb (self, entry, [], *args)
 			return
@@ -142,9 +142,9 @@
 				if ct.startswith("image/") or ct.startswith("x-directory/"):
 					continue
 
-				uri = dir.resolve_relative_path(f.get_name())
+				uri = dir.resolve_relative_path(f.get_name()).get_uri()
 				u_entry = db.entry_lookup_by_location (uri)
-				if e_entry:
+				if u_entry:
 					u_artist, u_album = [db.entry_get (u_entry, x) for x in [rhythmdb.PROP_ARTIST, rhythmdb.PROP_ALBUM]]
 					if album != u_album:
 						print "Not saving local art; encountered media with different album (%s, %s, %s)" % (uri, u_artist, u_album)
@@ -163,7 +163,7 @@
 			return
 
 		f = gio.File(uri)
-		if uri.get_uri_scheme() == 'http':
+		if f.get_uri_scheme() in ('http','cdda','daap'):
 			print "not saving local art for %s" % uri
 			return