albumcover: 'checks' for possible timeouts

1 files changed, 14 insertions, 3 deletions

diff --git a/plugins/AlbumCover.py b/plugins/AlbumCover.py
index aa26ec1..fa689a0 100644
--- a/plugins/AlbumCover.py
+++ b/plugins/AlbumCover.py
@@ -229,7 +229,11 @@ class AmazonAlbumImage(object):
 	if not url:
 	  return None
 	img_re = re.compile(r'''registerImage\("original_image", "([^"]+)"''')
-	prod_data = urllib.urlopen(url).read()
+	try:
+		prod_data = urllib.urlopen(url).read()
+	except:
+		log.important("AlbumCover: timeout opening %s"%(url))
+		return None
 	m = img_re.search(prod_data)
 	if not m:
 	  return None
@@ -250,11 +254,18 @@ class AmazonAlbumImage(object):
 	data["Artist"] = self.artist
 	data["Keywords"] = self.album
 
-	fd = urllib.urlopen("%s?%s" % (self.awsurl, urllib.urlencode(data)))
+	try:
+		fd = urllib.urlopen("%s?%s" % (self.awsurl, urllib.urlencode(data)))
+		return fd.read()
+	except:
+		# this is very probable a timeout exception
+		log.important("AlbumCover: timeout openening %s"%(self.awsurl))
+	return None
 
-	return fd.read()
 
   def _GetResultURL(self, xmldata):
+	if not xmldata:
+		return None
 	url_re = re.compile(r"<DetailPageURL>([^<]+)</DetailPageURL>")
 	m = url_re.search(xmldata)
 	return m and m.group(1)