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

Page through Box folders.

This commit is contained in:
John Maguire 2013-02-13 14:19:50 +01:00
parent d21fa8cc67
commit 75394d0e8a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/internet/boxservice.cpp
View File

@ -176,8 +176,7 @@ void BoxService::InitialiseEventsFinished(QNetworkReply* reply) {
}
}
void BoxService::FetchRecursiveFolderItems(const int folder_id) {
// TODO: Page through large folders.
void BoxService::FetchRecursiveFolderItems(const int folder_id, const int offset) {
QUrl url(QString(kFolderItems).arg(folder_id));
QStringList fields;
fields << "etag"
@ -187,14 +186,18 @@ void BoxService::FetchRecursiveFolderItems(const int folder_id) {
<< "name";
QString fields_list = fields.join(",");
url.addQueryItem("fields", fields_list);
url.addQueryItem("limit", "1000"); // Maximum according to API docs.
url.addQueryItem("offset", QString::number(offset));
QNetworkRequest request(url);
AddAuthorizationHeader(&request);
QNetworkReply* reply = network_->get(request);
NewClosure(reply, SIGNAL(finished()),
this, SLOT(FetchFolderItemsFinished(QNetworkReply*)), reply);
this, SLOT(FetchFolderItemsFinished(QNetworkReply*, int)),
reply, folder_id);
}
void BoxService::FetchFolderItemsFinished(QNetworkReply* reply) {
void BoxService::FetchFolderItemsFinished(
QNetworkReply* reply, const int folder_id) {
reply->deleteLater();
QByteArray data = reply->readAll();
@ -203,6 +206,13 @@ void BoxService::FetchFolderItemsFinished(QNetworkReply* reply) {
QVariantMap response = parser.parse(data).toMap();
QVariantList entries = response["entries"].toList();
const int total_entries = response["total_count"].toInt();
const int offset = response["offset"].toInt();
if (entries.size() + offset < total_entries) {
// Fetch the next page if necessary.
FetchRecursiveFolderItems(folder_id, offset + entries.size());
}
foreach (const QVariant& e, entries) {
QVariantMap entry = e.toMap();
if (entry["type"].toString() == "folder") {

4
src/internet/boxservice.h
View File

@ -30,7 +30,7 @@ class BoxService : public CloudFileService {
private slots:
void ConnectFinished(OAuthenticator* oauth);
void FetchUserInfoFinished(QNetworkReply* reply);
void FetchFolderItemsFinished(QNetworkReply* reply);
void FetchFolderItemsFinished(QNetworkReply* reply, const int folder_id);
void RedirectFollowed(
QNetworkReply* reply, const Song& song, const QString& mime_type);
void InitialiseEventsFinished(QNetworkReply* reply);
@ -41,7 +41,7 @@ class BoxService : public CloudFileService {
bool is_authenticated() const;
void AddAuthorizationHeader(QNetworkRequest* request) const;
void UpdateFiles();
void FetchRecursiveFolderItems(const int folder_id);
void FetchRecursiveFolderItems(const int folder_id, const int offset = 0);
void UpdateFilesFromCursor(const QString& cursor);
QNetworkReply* FetchContentUrlForFile(const QString& file_id);
void InitialiseEventsCursor();