Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-16 11:42:05 +01:00
Code Issues Releases Wiki Activity

Update MusicBrainz DiscId requests to work with Web Service v2: v1 wasn't working anymore

Browse Source
This commit is contained in:
Arnaud Bienner 2012-11-18 22:11:47 +01:00
parent fb07308607
commit ba743ee64f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/musicbrainz/musicbrainzclient.cpp
View File

@ -28,7 +28,7 @@
#include "core/utilities.h"
const char* MusicBrainzClient::kTrackUrl = "http://musicbrainz.org/ws/2/recording/";
const char* MusicBrainzClient::kDiscUrl = "http://musicbrainz.org/ws/1/release/";
const char* MusicBrainzClient::kDiscUrl = "http://musicbrainz.org/ws/2/discid/";
const char* MusicBrainzClient::kDateRegex = "^[12]\\d{3}";
const int MusicBrainzClient::kDefaultTimeout = 5000; // msec
@ -61,10 +61,9 @@ void MusicBrainzClient::StartDiscIdRequest(const QString& discid) {
typedef QPair<QString, QString> Param;
QList<Param> parameters;
parameters << Param("type", "xml")
<< Param("discid", discid);
parameters << Param("inc", "artists+recordings");
QUrl url(kDiscUrl);
QUrl url(kDiscUrl + discid);
url.setQueryItems(parameters);
QNetworkRequest req(url);
@ -117,7 +116,7 @@ void MusicBrainzClient::DiscIdRequestFinished(QNetworkReply* reply) {
while (!reader.atEnd()) {
QXmlStreamReader::TokenType token = reader.readNext();
if (token == QXmlStreamReader::StartElement && reader.name() == "track") {
if (token == QXmlStreamReader::StartElement && reader.name() == "recording") {
ResultList tracks = ParseTrack(&reader);
foreach (const Result& track, tracks) {
if (!track.title_.isEmpty()) {
@ -185,8 +184,12 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader* re
}
ResultList ret;
foreach (const Release& release, releases) {
ret << release.CopyAndMergeInto(result);
if (releases.isEmpty()) {
ret << result;
} else {
foreach (const Release& release, releases) {
ret << release.CopyAndMergeInto(result);
}
}
return ret;
}