oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/SoundCloud: move code to TranslateSoundCloudUri()

Browse Source
This commit is contained in:
Max Kellermann 2021-10-13 12:22:12 +02:00
parent 7d4de71899
commit d2b8852d19
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@ -86,6 +86,38 @@ soundcloud_resolve(const char* uri)
return ru; return ru;
} }
static char *
TranslateSoundCloudUri(const char *uri) noexcept
{
if (strncmp(uri, "track/", 6) == 0) {
const char *rest = uri + 6;
return xstrcatdup("https://api.soundcloud.com/tracks/",
rest, ".json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "playlist/", 9) == 0) {
const char *rest = uri + 9;
return xstrcatdup("https://api.soundcloud.com/playlists/",
rest, ".json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "user/", 5) == 0) {
const char *rest = uri + 5;
return xstrcatdup("https://api.soundcloud.com/users/",
rest, "/tracks.json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "search/", 7) == 0) {
const char *rest = uri + 7;
return xstrcatdup("https://api.soundcloud.com/tracks.json?q=",
rest, "&client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "url/", 4) == 0) {
const char *rest = uri + 4;
/* Translate to soundcloud resolver call. libcurl will automatically
follow the redirect to the right resource. */
return soundcloud_resolve(rest);
} else
return nullptr;
}
/* YAJL parser for track data from both /tracks/ and /playlists/ JSON */ /* YAJL parser for track data from both /tracks/ and /playlists/ JSON */
static const char *const key_str[] = { static const char *const key_str[] = {
@ -240,34 +272,7 @@ soundcloud_open_uri(const char *uri, Mutex &mutex)
assert(StringEqualsCaseASCII(uri, "soundcloud://", 13)); assert(StringEqualsCaseASCII(uri, "soundcloud://", 13));
uri += 13; uri += 13;
char *u = nullptr; char *u = TranslateSoundCloudUri(uri);
if (strncmp(uri, "track/", 6) == 0) {
const char *rest = uri + 6;
u = xstrcatdup("https://api.soundcloud.com/tracks/",
rest, ".json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "playlist/", 9) == 0) {
const char *rest = uri + 9;
u = xstrcatdup("https://api.soundcloud.com/playlists/",
rest, ".json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "user/", 5) == 0) {
const char *rest = uri + 5;
u = xstrcatdup("https://api.soundcloud.com/users/",
rest, "/tracks.json?client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "search/", 7) == 0) {
const char *rest = uri + 7;
u = xstrcatdup("https://api.soundcloud.com/tracks.json?q=",
rest, "&client_id=",
soundcloud_config.apikey.c_str());
} else if (strncmp(uri, "url/", 4) == 0) {
const char *rest = uri + 4;
/* Translate to soundcloud resolver call. libcurl will automatically
follow the redirect to the right resource. */
u = soundcloud_resolve(rest);
}
AtScopeExit(u) { free(u); }; AtScopeExit(u) { free(u); };
if (u == nullptr) { if (u == nullptr) {