Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

SoundCloud: retrieve stream playlists

This commit is contained in:
Arnaud Bienner 2014-04-16 22:37:40 +02:00
parent 8c164e2a8f
commit ef01353a0f
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/internet/soundcloudservice.cpp
View File

@ -193,6 +193,7 @@ void SoundCloudService::Logout() {
access_token_.clear();
s.remove("access_token");
pending_playlists_requests_.clear();
if (user_activities_)
root_->removeRow(user_activities_->row());
if (user_tracks_)
@ -328,6 +329,14 @@ void SoundCloudService::ShowContextMenu(const QPoint& global_pos) {
context_menu_->popup(global_pos);
}
QStandardItem* SoundCloudService::CreatePlaylistItem(const QString& playlist_name) {
QStandardItem* item = new QStandardItem(playlist_name);
item->setData(true, InternetModel::Role_CanLazyLoad);
item->setData(InternetModel::PlayBehaviour_MultipleItems,
InternetModel::Role_PlayBehaviour);
return item;
}
QNetworkReply* SoundCloudService::CreateRequest(const QString& ressource_name,
const QList<Param>& params) {
@ -369,6 +378,30 @@ QVariant SoundCloudService::ExtractResult(QNetworkReply* reply) {
return result;
}
void SoundCloudService::RetrievePlaylist(int playlist_id, QStandardItem* playlist_item) {
const int request_id = next_retrieve_playlist_id_++;
pending_playlists_requests_.insert(
request_id,
PlaylistInfo(playlist_id, playlist_item));
QList<Param> parameters;
parameters << Param("oauth_token", access_token_);
QNetworkReply* reply = CreateRequest("playlists/" + QString::number(playlist_id), parameters);
NewClosure(reply, SIGNAL(finished()), this,
SLOT(PlaylistRetrieved(QNetworkReply*, int)), reply, request_id);
}
void SoundCloudService::PlaylistRetrieved(QNetworkReply* reply, int request_id) {
if (!pending_playlists_requests_.contains(request_id))
return;
PlaylistInfo playlist_info = pending_playlists_requests_.take(request_id);
QVariant res = ExtractResult(reply);
SongList songs = ExtractSongs(res.toMap()["tracks"]);
for (const Song& song : songs) {
QStandardItem* child = CreateSongItem(song);
playlist_info.item_->appendRow(child);
}
}
QList<QStandardItem*> SoundCloudService::ExtractActivities(const QVariant& result) {
QList<QStandardItem*> activities;
QVariantList q_variant_list = result.toMap()["collection"].toList();
@ -381,7 +414,11 @@ QList<QStandardItem*> SoundCloudService::ExtractActivities(const QVariant& resul
activities << CreateSongItem(song);
}
} else if (type == "playlist") {
// TODO
QMap<QString, QVariant> origin_map = activity["origin"].toMap();
QStandardItem* playlist_item =
CreatePlaylistItem(origin_map["title"].toString());
activities << playlist_item;
RetrievePlaylist(origin_map["id"].toInt(), playlist_item);
}
}
return activities;

18
src/internet/soundcloudservice.h
View File

@ -63,6 +63,7 @@ class SoundCloudService : public InternetService {
void ConnectFinished(OAuthenticator* oauth);
void UserTracksRetrieved(QNetworkReply* reply);
void UserActivitiesRetrieved(QNetworkReply* reply);
void PlaylistRetrieved(QNetworkReply* reply, int request_id);
void Search(const QString& text, bool now = false);
void DoSearch();
void SearchFinished(QNetworkReply* reply, int task);
@ -71,15 +72,28 @@ class SoundCloudService : public InternetService {
void Homepage();
private:
struct PlaylistInfo {
PlaylistInfo() {}
PlaylistInfo(int id, QStandardItem* item)
: id_(id), item_(item) {}
int id_;
QStandardItem* item_;
};
// Try to load "access_token" from preferences if the current access_token's
// value is empty
void LoadAccessTokenIfEmpty();
void RetrieveUserData();
void RetrieveUserTracks();
void RetrieveUserActivities();
void RetrievePlaylist(int playlist_id, QStandardItem* playlist_item);
void ClearSearchResults();
void EnsureItemsCreated();
void EnsureMenuCreated();
QStandardItem* CreatePlaylistItem(const QString& playlist_name);
QNetworkReply* CreateRequest(const QString& ressource_name,
const QList<QPair<QString, QString> >& params);
// Convenient function for extracting result from reply
@ -100,7 +114,11 @@ class SoundCloudService : public InternetService {
SearchBoxWidget* search_box_;
QTimer* search_delay_;
QString pending_search_;
// Request IDs
int next_pending_search_id_;
int next_retrieve_playlist_id_;
QMap<int, PlaylistInfo> pending_playlists_requests_;
QByteArray api_key_;