iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix context widget backdrop retrieval from fan-art

Browse Source
This commit is contained in:
Craig Drummond
2015-11-05 21:26:35 +00:00
committed by Craig Drummond
parent 7eb9085257
commit 4e577df505
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -75,7 +75,7 @@
53. Fix starting Cantata maximised.
54. Ignore 'The' (if configured) when sorting play queue.
55. No longer using discogs - API has changed.
56. Fix context widget backdrop retrieval from fan-art
1.5.2
-----
1. Fix Ubuntu Touch builds.

36
context/contextwidget.cpp
View File

@@ -861,7 +861,18 @@ void ContextWidget::musicbrainzResponse()
getMusicbrainzId(artist);
}
} else {
QUrl url("http://api.fanart.tv/webservice/artist/"+constFanArtApiKey+"/"+id+"/json/artistbackground/1");
QUrl url("http://webservice.fanart.tv/v3/music/"+id);
#if QT_VERSION < 0x050000
QUrl &query=url;
#else
QUrlQuery query;
#endif
query.addQueryItem("api_key", constFanArtApiKey);
#if QT_VERSION >= 0x050000
url.setQuery(query);
#endif
job=NetworkAccessManager::self()->get(url);
DBUG << url.toString();
connect(job, SIGNAL(finished()), this, SLOT(fanArtResponse()));
@@ -889,14 +900,21 @@ void ContextWidget::fanArtResponse()
#endif
if (ok && !parsed.isEmpty()) {
QVariantMap artist=parsed[parsed.keys().first()].toMap();
if (artist.contains("artistbackground")) {
QVariantList artistbackgrounds=artist["artistbackground"].toList();
if (!artistbackgrounds.isEmpty()) {
QVariantMap artistbackground=artistbackgrounds.first().toMap();
if (artistbackground.contains("url")) {
url=artistbackground["url"].toString();
}
QVariantList artistbackgrounds;
if (parsed.contains("artistbackground")) {
artistbackgrounds=parsed["artistbackground"].toList();
} else {
QVariantMap artist=parsed[parsed.keys().first()].toMap();
if (artist.contains("artistbackground")) {
artistbackgrounds=artist["artistbackground"].toList();
}
}
if (!artistbackgrounds.isEmpty()) {
QVariantMap artistbackground=artistbackgrounds.first().toMap();
if (artistbackground.contains("url")) {
url=artistbackground["url"].toString();
}
}
}