Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed filter for audio/folder OneDrive items as OneDrive doesn't count many audio file types as audio (e.g. flac) (#5977)

Browse Source
This commit is contained in:
Benjamin Sproule 2018-02-01 11:38:25 +00:00 committed by John Maguire
parent efeafeea6c
commit 595eec7878
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internet/skydrive/skydriveservice.cpp
View File

@ -125,7 +125,6 @@ void SkydriveService::FetchUserInfoFinished(QNetworkReply* reply) {
void SkydriveService::ListFiles(const QString& folder) { void SkydriveService::ListFiles(const QString& folder) {
QUrl url(QString(kSkydriveBase) + folder + "/files"); QUrl url(QString(kSkydriveBase) + folder + "/files");
url.addQueryItem("filter", "audio,folders");
QNetworkRequest request(url); QNetworkRequest request(url);
AddAuthorizationHeader(&request); AddAuthorizationHeader(&request);
@ -142,7 +141,9 @@ void SkydriveService::ListFilesFinished(QNetworkReply* reply) {
QVariantList files = response["data"].toList(); QVariantList files = response["data"].toList();
for (const QVariant& f : files) { for (const QVariant& f : files) {
QVariantMap file = f.toMap(); QVariantMap file = f.toMap();
if (file["type"].toString() == "audio") { if (file["type"].toString() == "folder") {
ListFiles(file["id"].toString());
} else {
QString mime_type = GuessMimeTypeForFile(file["name"].toString()); QString mime_type = GuessMimeTypeForFile(file["name"].toString());
QUrl url; QUrl url;
url.setScheme("skydrive"); url.setScheme("skydrive");
@ -161,8 +162,6 @@ void SkydriveService::ListFilesFinished(QNetworkReply* reply) {
// Fortunately, just changing the scheme to HTTP works. // Fortunately, just changing the scheme to HTTP works.
download_url.setScheme("http"); download_url.setScheme("http");
MaybeAddFileToDatabase(song, mime_type, download_url, QString::null); MaybeAddFileToDatabase(song, mime_type, download_url, QString::null);
} else if (file["type"].toString() == "folder") {
ListFiles(file["id"].toString());
} }
} }
} }