Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-16 19:31:02 +01:00
Code Issues Releases Wiki Activity

Make sure Google Drive is connected when converting URLs.

Browse Source
This commit is contained in:
John Maguire 2012-08-10 11:46:26 -07:00
parent a55cbc838f
commit 9ce8cf59d6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/internet/googledriveservice.cpp
View File

@ -65,7 +65,9 @@ QStandardItem* GoogleDriveService::CreateRootItem() {
void GoogleDriveService::LazyPopulate(QStandardItem* item) { void GoogleDriveService::LazyPopulate(QStandardItem* item) {
switch (item->data(InternetModel::Role_Type).toInt()) { switch (item->data(InternetModel::Role_Type).toInt()) {
case InternetModel::Type_Service: case InternetModel::Type_Service:
Connect(); if (!client_->is_authenticated()) {
Connect();
}
library_model_->Init(); library_model_->Init();
model()->merged_model()->AddSubModel(item->index(), library_sort_model_); model()->merged_model()->AddSubModel(item->index(), library_sort_model_);
break; break;
@ -110,6 +112,17 @@ void GoogleDriveService::ConnectFinished(google_drive::ConnectResponse* response
ListFilesForMimeType("application/x-flac"); // FLAC ListFilesForMimeType("application/x-flac"); // FLAC
} }
void GoogleDriveService::EnsureConnected() {
if (client_->is_authenticated()) {
return;
}
QEventLoop loop;
connect(client_, SIGNAL(Authenticated()), &loop, SLOT(quit()));
Connect();
loop.exec();
}
void GoogleDriveService::FilesFound(const QList<google_drive::File>& files) { void GoogleDriveService::FilesFound(const QList<google_drive::File>& files) {
foreach (const google_drive::File& file, files) { foreach (const google_drive::File& file, files) {
MaybeAddFileToDatabase(file); MaybeAddFileToDatabase(file);
@ -183,6 +196,7 @@ void GoogleDriveService::ReadTagsFinished(TagReaderClient::ReplyType* reply,
} }
QUrl GoogleDriveService::GetStreamingUrlFromSongId(const QString& id) { QUrl GoogleDriveService::GetStreamingUrlFromSongId(const QString& id) {
EnsureConnected();
QScopedPointer<google_drive::GetFileResponse> response(client_->GetFile(id)); QScopedPointer<google_drive::GetFileResponse> response(client_->GetFile(id));
QEventLoop loop; QEventLoop loop;

1
src/internet/googledriveservice.h
View File

@ -46,6 +46,7 @@ class GoogleDriveService : public InternetService {
private: private:
void Connect(); void Connect();
void EnsureConnected();
void RefreshAuthorisation(const QString& refresh_token); void RefreshAuthorisation(const QString& refresh_token);
void MaybeAddFileToDatabase(const google_drive::File& file); void MaybeAddFileToDatabase(const google_drive::File& file);
void ListFilesForMimeType(const QString& mime_type); void ListFilesForMimeType(const QString& mime_type);