dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DeezerCoverProvider: Fix parsing

Browse Source 
Fixes #1716
This commit is contained in:
Jonas Kvinge
2025-04-08 20:03:54 +02:00
parent 4fff5820c5
commit fcee02edc1
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/covermanager/deezercoverprovider.cpp
View File

@@ -158,16 +158,16 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id)
} }
const QJsonObject &json_object = json_object_result.json_object; const QJsonObject &json_object = json_object_result.json_object;
if (!json_object.isEmpty()) { if (json_object.isEmpty()) {
return; return;
} }
QJsonArray array_data; QJsonArray array_data;
if (json_object.contains("data"_L1) && json_object["DATA"_L1].isArray()) { if (json_object.contains("data"_L1) && json_object["data"_L1].isArray()) {
array_data = json_object["data"_L1].toArray(); array_data = json_object["data"_L1].toArray();
} }
else if (json_object.contains("DATA"_L1) && json_object["DATA"_L1].isArray()) { else if (json_object.contains("DATA"_L1) && json_object["DATA"_L1].isArray()) {
array_data = json_object["data"_L1].toArray(); array_data = json_object["DATA"_L1].toArray();
} }
else { else {
Error(u"Json reply object is missing data."_s, json_object); Error(u"Json reply object is missing data."_s, json_object);
@@ -180,23 +180,23 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id)
QMap<QUrl, CoverProviderSearchResult> cover_results; QMap<QUrl, CoverProviderSearchResult> cover_results;
int i = 0; int i = 0;
for (const QJsonValue &json_value : std::as_const(array_data)) { for (const QJsonValue &value_entry : std::as_const(array_data)) {
if (!json_value.isObject()) { if (!value_entry.isObject()) {
Error(u"Invalid Json reply, data array value is not a object."_s); Error(u"Invalid Json reply, data array value is not a object."_s);
continue; continue;
} }
const QJsonObject value_object = json_value.toObject(); const QJsonObject object_entry = value_entry.toObject();
QJsonObject object_album; QJsonObject object_album;
if (value_object.contains("album"_L1) && value_object["album"_L1].isObject()) { // Song search, so extract the album. if (object_entry.contains("album"_L1) && object_entry["album"_L1].isObject()) { // Song search, so extract the album.
object_album = value_object["album"_L1].toObject(); object_album = object_entry["album"_L1].toObject();
} }
else { else {
object_album = value_object; object_album = object_entry;
} }
if (!value_object.contains("id"_L1) || !object_album.contains("id"_L1)) { if (!object_entry.contains("id"_L1) || !object_album.contains("id"_L1)) {
Error(u"Invalid Json reply, data array value object is missing ID."_s, value_object); Error(u"Invalid Json reply, data array value object is missing ID."_s, object_entry);
continue; continue;
} }
@@ -210,11 +210,11 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id)
continue; continue;
} }
if (!json_object.contains("artist"_L1)) { if (!object_entry.contains("artist"_L1)) {
Error(u"Invalid Json reply, data array value object is missing artist."_s, json_object); Error(u"Invalid Json reply, data array value object is missing artist."_s, object_entry);
continue; continue;
} }
const QJsonValue value_artist = json_object["artist"_L1]; const QJsonValue value_artist = object_entry["artist"_L1];
if (!value_artist.isObject()) { if (!value_artist.isObject()) {
Error(u"Invalid Json reply, data array value artist is not a object."_s, value_artist); Error(u"Invalid Json reply, data array value artist is not a object."_s, value_artist);
continue; continue;
@@ -242,12 +242,12 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id)
<< qMakePair(u"cover_big"_s, QSize(500, 500)); << qMakePair(u"cover_big"_s, QSize(500, 500));
for (const QPair<QString, QSize> &cover_size : cover_sizes) { for (const QPair<QString, QSize> &cover_size : cover_sizes) {
if (!object_album.contains(cover_size.first)) continue; if (!object_album.contains(cover_size.first)) continue;
QString cover = object_album[cover_size.first].toString(); const QString cover = object_album[cover_size.first].toString();
if (!have_cover) { if (!have_cover) {
have_cover = true; have_cover = true;
++i; ++i;
} }
QUrl url(cover); const QUrl url(cover);
if (!cover_results.contains(url)) { if (!cover_results.contains(url)) {
cover_result.image_url = url; cover_result.image_url = url;
cover_result.image_size = cover_size.second; cover_result.image_size = cover_size.second;