[0;33m=== modified file 'artdisplay2/AmazonCoverArtSearch.py'
[0m[0;31m--- artdisplay2/AmazonCoverArtSearch.py	2007-11-15 07:32:41 +0000
[0m[0;32m+++ artdisplay2/AmazonCoverArtSearch.py	2007-11-16 23:59:02 +0000
[0m[0;35m@@ -268,7 +268,8 @@
[0m[0;30m 							break
[0m[0;30m 
[0m[0;30m 			if best_match:
[0m[0;31m-				return filter(lambda x: x != "", [item.ImageUrlLarge, item.ImageUrlMedium])
[0m[0;32m+				return ((None, url) for url in (item.ImageUrlLarge, item.ImageUrlMedium)
[0m[0;32m+				        if url != '')
[0m[0;30m 			else:
[0m[0;30m 				return []
[0m[0;30m 
[0m[0;30m
[0m[0;33m=== modified file 'artdisplay2/CoverArtDatabase.py'
[0m[0;31m--- artdisplay2/CoverArtDatabase.py	2007-11-15 07:32:41 +0000
[0m[0;32m+++ artdisplay2/CoverArtDatabase.py	2007-11-17 00:10:01 +0000
[0m[0;35m@@ -151,13 +151,14 @@
[0m[0;30m 				_, (engine, entry, results) = plexer.receive ()
[0m[0;30m 				if not results:
[0m[0;30m 					break
[0m[0;31m-				for url in engine.get_best_match_urls (results):
[0m[0;31m-					if str(url) == "":
[0m[0;31m-						print "got empty url from engine %s." % (engine)
[0m[0;31m-						continue
[0m[0;31m-
[0m[0;31m-					yield self.loader.get_url (str (url), plexer.send ())
[0m[0;31m-					_, (data, ) = plexer.receive ()
[0m[0;32m+				for data, url in engine.get_best_match_urls (results):
[0m[0;32m+					if not data:
[0m[0;32m+						if str(url) == "":
[0m[0;32m+							print "got empty url from engine %s." % (engine)
[0m[0;32m+							continue
[0m[0;32m+							
[0m[0;32m+						yield self.loader.get_url (str (url), plexer.send ())
[0m[0;32m+						_, (data, ) = plexer.receive ()
[0m[0;30m 					pixbuf = self.image_data_load (data)
[0m[0;30m 					if pixbuf:
[0m[0;30m 						if self.ticket.release (entry, ticket):
[0m[0;30m
[0m[0;33m=== modified file 'artdisplay2/LocalCoverArtSearch.py'
[0m[0;31m--- artdisplay2/LocalCoverArtSearch.py	2007-11-15 07:32:41 +0000
[0m[0;32m+++ artdisplay2/LocalCoverArtSearch.py	2007-11-16 23:59:12 +0000
[0m[0;35m@@ -68,7 +68,7 @@
[0m[0;30m 		for name in [file_root (self.uri.short_name)] + IMAGE_NAMES:
[0m[0;30m 			for f_name in results:
[0m[0;30m 				if file_root (f_name) == name:
[0m[0;31m-					yield self.uri.parent.append_file_name (f_name).path
[0m[0;32m+					yield None, self.uri.parent.append_file_name (f_name).path
[0m[0;30m 
[0m[0;30m 	def pixbuf_save (self, plexer, pixbuf, uri):
[0m[0;30m 		gnomevfs.async.create (uri, plexer.send (), gnomevfs.OPEN_WRITE | gnomevfs.OPEN_TRUNCATE, False, 0644, gnomevfs.PRIORITY_DEFAULT)
[0m[0;30m
[0m[0;33m=== modified file 'artdisplay2/PodcastCoverArtSearch.py'
[0m[0;31m--- artdisplay2/PodcastCoverArtSearch.py	2007-11-15 07:32:41 +0000
[0m[0;32m+++ artdisplay2/PodcastCoverArtSearch.py	2007-11-16 23:59:24 +0000
[0m[0;35m@@ -56,4 +56,4 @@
[0m[0;30m 
[0m[0;30m 	def get_best_match_urls (self, search_results):
[0m[0;30m 		# Return image URL
[0m[0;31m-		return [search_results]
[0m[0;32m+		return [None, search_results]
[0m[0;30m
[0m