Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TidalRequest: Make cover optional

Browse Source
This commit is contained in:
Jonas Kvinge 2023-01-20 23:35:47 +01:00
parent d276339c80
commit 377f54700d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tidal/tidalrequest.cpp
View File

@ -1075,8 +1075,8 @@ void TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
return; return;
} }
QJsonObject obj_album = value_album.toObject(); QJsonObject obj_album = value_album.toObject();
if (!obj_album.contains("id") || !obj_album.contains("title") || !obj_album.contains("cover")) { if (!obj_album.contains("id") || !obj_album.contains("title")) {
Error("Invalid Json reply, track album is missing id, title or cover.", obj_album); Error("Invalid Json reply, track album is missing ID or title.", obj_album);
return; return;
} }
QString album_id; QString album_id;
@ -1092,7 +1092,6 @@ void TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
} }
QString album_title = obj_album["title"].toString(); QString album_title = obj_album["title"].toString();
if (album.album_explicit) album_title.append(" (Explicit)"); if (album.album_explicit) album_title.append(" (Explicit)");
QString cover = obj_album["cover"].toString();
if (!allow_streaming) { if (!allow_streaming) {
Warn(QString("Song %1 %2 %3 is not allowStreaming").arg(artist, album_title, title)); Warn(QString("Song %1 %2 %3 is not allowStreaming").arg(artist, album_title, title));
@ -1118,8 +1117,13 @@ void TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
return; return;
} }
cover = cover.replace("-", "/"); QUrl cover_url;
QUrl cover_url(QString("%1/images/%2/%3.jpg").arg(kResourcesUrl, cover, coversize_)); if (obj_album.contains("cover")) {
const QString cover = obj_album["cover"].toString().replace("-", "/");
if (!cover.isEmpty()) {
cover_url.setUrl(QString("%1/images/%2/%3.jpg").arg(kResourcesUrl, cover, coversize_));
}
}
title.remove(Song::kTitleRemoveMisc); title.remove(Song::kTitleRemoveMisc);
@ -1137,7 +1141,9 @@ void TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
song.set_disc(disc); song.set_disc(disc);
song.set_url(url); song.set_url(url);
song.set_length_nanosec(duration); song.set_length_nanosec(duration);
if (cover_url.isValid()) {
song.set_art_automatic(cover_url); song.set_art_automatic(cover_url);
}
song.set_comment(copyright); song.set_comment(copyright);
song.set_directory_id(0); song.set_directory_id(0);
song.set_filetype(Song::FileType_Stream); song.set_filetype(Song::FileType_Stream);