From ce3ba02749632c08e0004b7de11970111d7ac501 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 11 Feb 2016 16:59:11 +0000 Subject: [PATCH] Fix songkick concert fetching --- src/songinfo/songkickconcerts.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/songinfo/songkickconcerts.cpp b/src/songinfo/songkickconcerts.cpp index c3ee4eff6..4bb218fea 100644 --- a/src/songinfo/songkickconcerts.cpp +++ b/src/songinfo/songkickconcerts.cpp @@ -22,6 +22,7 @@ #include #include +#include #include @@ -30,7 +31,7 @@ #include "songkickconcertwidget.h" #include "ui/iconloader.h" -const char* SongkickConcerts::kSongkickArtistBucket = "id:songkick"; +const char* SongkickConcerts::kSongkickArtistBucket = "songkick"; const char* SongkickConcerts::kSongkickArtistCalendarUrl = "https://api.songkick.com/api/3.0/artists/%1/calendar.json?" "per_page=5&" @@ -49,10 +50,11 @@ void SongkickConcerts::FetchInfo(int id, const Song& metadata) { Echonest::Artist::SearchParams params; params.push_back( qMakePair(Echonest::Artist::Name, QVariant(metadata.artist()))); - params.push_back( - qMakePair(Echonest::Artist::IdSpace, QVariant(kSongkickArtistBucket))); qLog(Debug) << "Params:" << params; - QNetworkReply* reply = Echonest::Artist::search(params); + QNetworkReply* reply = Echonest::Artist::search( + params, + Echonest::ArtistInformation(Echonest::ArtistInformation::NoInformation, + QStringList() << kSongkickArtistBucket)); qLog(Debug) << reply->request().url(); NewClosure(reply, SIGNAL(finished()), this, SLOT(ArtistSearchFinished(QNetworkReply*, int)), reply, id); @@ -92,8 +94,7 @@ void SongkickConcerts::ArtistSearchFinished(QNetworkReply* reply, int id) { } FetchSongkickCalendar(split[2], id); - } - catch (Echonest::ParseError& e) { + } catch (Echonest::ParseError& e) { qLog(Error) << "Error parsing echonest reply:" << e.errorType() << e.what(); emit Finished(id); }