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

Show only one status bar entry while indexing files on Drive.

This commit is contained in:
David Sansome 2014-03-30 15:47:25 +11:00
parent d662d23e53
commit ca7937112d
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/internet/cloudfileservice.cpp
View File

@ -28,7 +28,10 @@ CloudFileService::CloudFileService(Application* app, InternetModel* parent,
playlist_manager_(app->playlist_manager()),
task_manager_(app->task_manager()),
icon_(icon),
settings_page_(settings_page) {
settings_page_(settings_page),
indexing_task_id_(-1),
indexing_task_progress_(0),
indexing_task_max_(0) {
library_backend_ = new LibraryBackend;
library_backend_->moveToThread(app_->database()->thread());
@ -122,22 +125,36 @@ void CloudFileService::MaybeAddFileToDatabase(const Song& metadata,
return;
}
const int task_id =
task_manager_->StartTask(tr("Indexing %1").arg(metadata.title()));
if (indexing_task_id_ == -1) {
indexing_task_id_ =
task_manager_->StartTask(tr("Indexing %1").arg(name()));
indexing_task_progress_ = 0;
indexing_task_max_ = 0;
}
indexing_task_max_ ++;
task_manager_->SetTaskProgress(
indexing_task_id_, indexing_task_progress_, indexing_task_max_);
TagReaderClient::ReplyType* reply = app_->tag_reader_client()->ReadCloudFile(
download_url, metadata.title(), metadata.filesize(), mime_type,
authorisation);
NewClosure(reply, SIGNAL(Finished(bool)), this,
SLOT(ReadTagsFinished(TagReaderClient::ReplyType*, Song, int)),
reply, metadata, task_id);
SLOT(ReadTagsFinished(TagReaderClient::ReplyType*, Song)),
reply, metadata);
}
void CloudFileService::ReadTagsFinished(TagReaderClient::ReplyType* reply,
const Song& metadata,
const int task_id) {
const Song& metadata) {
reply->deleteLater();
TaskManager::ScopedTask(task_id, task_manager_);
indexing_task_progress_ ++;
if (indexing_task_progress_ == indexing_task_max_) {
task_manager_->SetTaskFinished(indexing_task_id_);
indexing_task_id_ = -1;
} else {
task_manager_->SetTaskProgress(
indexing_task_id_, indexing_task_progress_, indexing_task_max_);
}
const pb::tagreader::ReadCloudFileResponse& message =
reply->message().read_cloud_file_response();

8
src/internet/cloudfileservice.h
View File

@ -44,8 +44,8 @@ class CloudFileService : public InternetService {
void ShowCoverManager();
void AddToPlaylist(QMimeData* mime);
void ShowSettingsDialog();
void ReadTagsFinished(TagReaderClient::ReplyType* reply, const Song& metadata,
const int task_id);
void ReadTagsFinished(TagReaderClient::ReplyType* reply,
const Song& metadata);
protected:
QStandardItem* root_;
@ -63,6 +63,10 @@ class CloudFileService : public InternetService {
private:
QIcon icon_;
SettingsDialog::Page settings_page_;
int indexing_task_id_;
int indexing_task_progress_;
int indexing_task_max_;
};
#endif // CLOUDFILESERVICE_H