fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-03-02 03:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass url as text to _append_image_url() instead of QUrl object

Browse Source
This commit is contained in:
Laurent Monin
2014-05-04 15:00:49 +02:00
parent c5efe95ff0
commit f7bf4acfa1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
picard/coverart.py
View File

@@ -221,9 +221,9 @@ class CoverArt:
imagesize = config.setting["caa_image_size"]
thumbsize = _CAA_THUMBNAIL_SIZE_MAP.get(imagesize, None)
if thumbsize is None:
url = QUrl(image["image"])
url = image["image"]
else:
url = QUrl(image["thumbnails"][thumbsize])
url = image["thumbnails"][thumbsize]
extras = {
'type': image["types"][0].lower(), # FIXME: we pass only 1 type
'desc': image["comment"],
@@ -246,7 +246,7 @@ class CoverArt:
if use_whitelist \
and (relation.type == 'cover art link' or
relation.type == 'has_cover_art_at'):
url = QUrl(relation.target[0].text)
url = relation.target[0].text
self._append_image_url(url)
elif use_amazon \
and (relation.type == 'amazon asin' or
@@ -293,10 +293,11 @@ class CoverArt:
host = serverInfo['server']
path_l = AMAZON_IMAGE_PATH % (amz['asin'], serverInfo['id'], 'L')
path_m = AMAZON_IMAGE_PATH % (amz['asin'], serverInfo['id'], 'M')
self._append_image_url(QUrl("http://%s:%s" % (host, path_l)))
self._append_image_url(QUrl("http://%s:%s" % (host, path_m)))
self._append_image_url("http://%s:%s" % (host, path_l))
self._append_image_url("http://%s:%s" % (host, path_m))
def _append_image_url(self, parsedUrl, extras=None):
def _append_image_url(self, url, extras=None):
parsedUrl = QUrl(url)
path = str(parsedUrl.encodedPath())
if parsedUrl.hasQuery():
path += '?' + parsedUrl.encodedQuery()