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

Make 'ExtractSongs' not return valid song if 'result' is invalid/empty

Browse Source
This commit is contained in:
Arnaud Bienner 2011-12-01 21:46:16 +01:00
parent 0023e4faf6
commit 74ea844811
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/internet/groovesharkradio.cpp
View File

@ -52,7 +52,7 @@ PlaylistItemList GroovesharkRadio::Generate() {
song = service_->StartAutoplay(autoplay_state_);
}
// If the song url isn't valid, stop here
if (song.url().toString() == "grooveshark://0/0/0") {
if (!song.is_valid()) {
return items;
}
PlaylistItemPtr playlist_item = PlaylistItemPtr(new InternetPlaylistItem(service_, song));
@ -60,7 +60,7 @@ PlaylistItemList GroovesharkRadio::Generate() {
first_time_ = false;
}
Song song = service_->GetAutoplaySong(autoplay_state_);
if (song.url().toString() == "grooveshark://0/0/0") {
if (!song.is_valid()) {
return items;
}
PlaylistItemPtr playlist_item = PlaylistItemPtr(new InternetPlaylistItem(service_, song));

31
src/internet/groovesharkservice.cpp
View File

@ -1430,21 +1430,22 @@ SongList GroovesharkService::ExtractSongs(const QVariantMap& result) {
Song GroovesharkService::ExtractSong(const QVariantMap& result_song) {
Song song;
int song_id = result_song["SongID"].toInt();
QString song_name = result_song["SongName"].toString();
int artist_id = result_song["ArtistID"].toInt();
QString artist_name = result_song["ArtistName"].toString();
int album_id = result_song["AlbumID"].toInt();
QString album_name = result_song["AlbumName"].toString();
QString cover = result_song["CoverArtFilename"].toString();
song.Init(song_name, artist_name, album_name, 0);
song.set_art_automatic(QString(kUrlCover) + cover);
// Special kind of URL: because we need to request a stream key for each
// play, we generate a fake URL for now, and we will create a real streaming
// URL when user will actually play the song (through url handler)
// URL is grooveshark://artist_id/album_id/song_id
song.set_url(QString("grooveshark://%1/%2/%3").arg(artist_id).arg(album_id).arg(song_id));
if (!result_song.isEmpty()) {
int song_id = result_song["SongID"].toInt();
QString song_name = result_song["SongName"].toString();
int artist_id = result_song["ArtistID"].toInt();
QString artist_name = result_song["ArtistName"].toString();
int album_id = result_song["AlbumID"].toInt();
QString album_name = result_song["AlbumName"].toString();
QString cover = result_song["CoverArtFilename"].toString();
song.Init(song_name, artist_name, album_name, 0);
song.set_art_automatic(QString(kUrlCover) + cover);
// Special kind of URL: because we need to request a stream key for each
// play, we generate a fake URL for now, and we will create a real streaming
// URL when user will actually play the song (through url handler)
// URL is grooveshark://artist_id/album_id/song_id
song.set_url(QString("grooveshark://%1/%2/%3").arg(artist_id).arg(album_id).arg(song_id));
}
return song;
}