Skip to content

Commit 0f38035

Browse files
committed
WBackendSoundCloud: Fix the 'extract playlist' function
1 parent e66da27 commit 0f38035

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

src/SkBackend/src/media/WBackendSoundCloud.cpp

+30-9
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,19 @@ WBackendNetPlaylist WBackendSoundCloud::extractPlaylist(const QByteArray &
599599

600600
QString idPlaylist = WControllerNetwork::extractJsonUtf8(json, "id");
601601

602+
QString title = WControllerNetwork::extractJsonUtf8(json, "title");
603+
QString cover = WControllerNetwork::extractJson (json, "artwork_url");
604+
605+
if (cover == "null")
606+
{
607+
cover = WControllerNetwork::extractJson(json, "avatar_url");
608+
}
609+
610+
d->applyCover(&cover);
611+
612+
reply.title = title;
613+
reply.cover = cover;
614+
602615
WBackendNetQuery * nextQuery = &(reply.nextQuery);
603616

604617
nextQuery->url = "https://api.soundcloud.com/playlists/" + idPlaylist
@@ -611,6 +624,14 @@ WBackendNetPlaylist WBackendSoundCloud::extractPlaylist(const QByteArray &
611624

612625
QString source = WControllerNetwork::extractJsonUtf8(json, "uri");
613626

627+
QString title = WControllerNetwork::extractJsonUtf8(json, "username");
628+
QString cover = WControllerNetwork::extractJson (json, "avatar_url");
629+
630+
d->applyCover(&cover);
631+
632+
reply.title = title;
633+
reply.cover = cover;
634+
614635
WBackendNetQuery * nextQuery = &(reply.nextQuery);
615636

616637
nextQuery->url = source + "/tracks?client_id=" + query.data.toString();
@@ -647,12 +668,12 @@ WBackendNetFolder WBackendSoundCloud::extractFolder(const QByteArray & dat
647668

648669
if (query.id == 0) // people
649670
{
650-
foreach (const QString & string, list)
671+
foreach (const QString & json, list)
651672
{
652-
QString id = WControllerNetwork::extractJson(string, "permalink");
673+
QString id = WControllerNetwork::extractJson(json, "permalink");
653674

654-
QString title = WControllerNetwork::extractJsonUtf8(string, "username");
655-
QString cover = WControllerNetwork::extractJson (string, "avatar_url");
675+
QString title = WControllerNetwork::extractJsonUtf8(json, "username");
676+
QString cover = WControllerNetwork::extractJson (json, "avatar_url");
656677

657678
d->applyCover(&cover);
658679

@@ -668,16 +689,16 @@ WBackendNetFolder WBackendSoundCloud::extractFolder(const QByteArray & dat
668689
}
669690
else // playlists
670691
{
671-
foreach (const QString & string, list)
692+
foreach (const QString & json, list)
672693
{
673-
QString source = WControllerNetwork::extractJson(string, "permalink_url");
694+
QString source = WControllerNetwork::extractJson(json, "permalink_url");
674695

675-
QString title = WControllerNetwork::extractJsonUtf8(string, "title");
676-
QString cover = WControllerNetwork::extractJson (string, "artwork_url");
696+
QString title = WControllerNetwork::extractJsonUtf8(json, "title");
697+
QString cover = WControllerNetwork::extractJson (json, "artwork_url");
677698

678699
if (cover == "null")
679700
{
680-
cover = WControllerNetwork::extractJson(string, "avatar_url");
701+
cover = WControllerNetwork::extractJson(json, "avatar_url");
681702
}
682703

683704
d->applyCover(&cover);

0 commit comments

Comments
 (0)