diff options
author | Alexander Tkachev | 2016-07-14 10:17:26 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | dfd68306de6f655a7bd2c68cea0b9299956ce8fc (patch) | |
tree | 5700c0c922aebc76f03bd9153f0304f10d346c6a /backends/cloud | |
parent | e25338ec2494c6ae2ff97f231108627635040f76 (diff) | |
download | scummvm-rg350-dfd68306de6f655a7bd2c68cea0b9299956ce8fc.tar.gz scummvm-rg350-dfd68306de6f655a7bd2c68cea0b9299956ce8fc.tar.bz2 scummvm-rg350-dfd68306de6f655a7bd2c68cea0b9299956ce8fc.zip |
CLOUD: Upgrade FolderDownloadRequest::getProgress()
Now NetworkReadStream, which is used in DownloadRequest, which is used
in FolderDownloadRequest, returns progress information provided by
libcurl.
Diffstat (limited to 'backends/cloud')
-rw-r--r-- | backends/cloud/downloadrequest.cpp | 6 | ||||
-rw-r--r-- | backends/cloud/downloadrequest.h | 3 | ||||
-rw-r--r-- | backends/cloud/folderdownloadrequest.cpp | 17 | ||||
-rw-r--r-- | backends/cloud/folderdownloadrequest.h | 2 | ||||
-rw-r--r-- | backends/cloud/id/iddownloadrequest.cpp | 7 | ||||
-rw-r--r-- | backends/cloud/id/iddownloadrequest.h | 3 |
6 files changed, 34 insertions, 4 deletions
diff --git a/backends/cloud/downloadrequest.cpp b/backends/cloud/downloadrequest.cpp index 43bb02a756..5efb87e0c8 100644 --- a/backends/cloud/downloadrequest.cpp +++ b/backends/cloud/downloadrequest.cpp @@ -122,4 +122,10 @@ void DownloadRequest::finishError(Networking::ErrorResponse error) { Request::finishError(error); } +double DownloadRequest::getProgress() const { + if (_remoteFileStream) + return _remoteFileStream->getProgress(); + return 0; +} + } // End of namespace Cloud diff --git a/backends/cloud/downloadrequest.h b/backends/cloud/downloadrequest.h index 99b7de37f0..138616a04b 100644 --- a/backends/cloud/downloadrequest.h +++ b/backends/cloud/downloadrequest.h @@ -54,6 +54,9 @@ public: virtual void handle(); virtual void restart(); + + /** Returns a number in range [0, 1], where 1 is "complete". */ + double getProgress() const; }; } // End of namespace Cloud diff --git a/backends/cloud/folderdownloadrequest.cpp b/backends/cloud/folderdownloadrequest.cpp index 6cf55b28cf..bbb3c646ac 100644 --- a/backends/cloud/folderdownloadrequest.cpp +++ b/backends/cloud/folderdownloadrequest.cpp @@ -21,6 +21,8 @@ */ #include "backends/cloud/folderdownloadrequest.h" +#include "backends/cloud/downloadrequest.h" +#include "backends/cloud/id/iddownloadrequest.h" #include "common/debug.h" #include "gui/downloaddialog.h" @@ -133,9 +135,18 @@ void FolderDownloadRequest::finishDownload(Common::Array<StorageFile> &files) { if (_fileArrayCallback) (*_fileArrayCallback)(Storage::FileArrayResponse(this, files)); } -double FolderDownloadRequest::getProgress() { - if (_totalFiles == 0) return 0; - return (double)(_totalFiles - _files.size()) / (double)(_totalFiles); +double FolderDownloadRequest::getProgress() const { + if (_totalFiles == 0) return 0; + + double currentFileProgress = 0; + DownloadRequest *downloadRequest = dynamic_cast<DownloadRequest *>(_workingRequest); + if (downloadRequest != nullptr) currentFileProgress = downloadRequest->getProgress(); + else { + Id::IdDownloadRequest *idDownloadRequest = dynamic_cast<Id::IdDownloadRequest *>(_workingRequest); + if (idDownloadRequest != nullptr) currentFileProgress = idDownloadRequest->getProgress(); + } + + return (double)(_totalFiles - _files.size() + currentFileProgress) / (double)(_totalFiles); } } // End of namespace Cloud diff --git a/backends/cloud/folderdownloadrequest.h b/backends/cloud/folderdownloadrequest.h index 41eacc2afe..a5f13b740b 100644 --- a/backends/cloud/folderdownloadrequest.h +++ b/backends/cloud/folderdownloadrequest.h @@ -56,7 +56,7 @@ public: virtual void restart(); /** Returns a number in range [0, 1], where 1 is "complete". */ - double getProgress(); + double getProgress() const; /** Returns remote directory path. */ Common::String getRemotePath() { return _remoteDirectoryPath; } diff --git a/backends/cloud/id/iddownloadrequest.cpp b/backends/cloud/id/iddownloadrequest.cpp index 154bd16edd..ac62284d46 100644 --- a/backends/cloud/id/iddownloadrequest.cpp +++ b/backends/cloud/id/iddownloadrequest.cpp @@ -22,6 +22,7 @@ #include "backends/cloud/id/iddownloadrequest.h" #include "backends/cloud/id/idstorage.h" +#include "backends/cloud/downloadrequest.h" namespace Cloud { namespace Id { @@ -87,5 +88,11 @@ void IdDownloadRequest::finishDownload(bool success) { if (_boolCallback) (*_boolCallback)(Storage::BoolResponse(this, success)); } +double IdDownloadRequest::getProgress() const { + DownloadRequest *downloadRequest = dynamic_cast<DownloadRequest *>(_workingRequest); + if (downloadRequest == nullptr) return 0.02; // resolving id still + return 0.1 + 0.9 * downloadRequest->getProgress(); // downloading +} + } // End of namespace Id } // End of namespace Cloud diff --git a/backends/cloud/id/iddownloadrequest.h b/backends/cloud/id/iddownloadrequest.h index 70397696a8..65e05c00b3 100644 --- a/backends/cloud/id/iddownloadrequest.h +++ b/backends/cloud/id/iddownloadrequest.h @@ -51,6 +51,9 @@ public: virtual void handle(); virtual void restart(); + + /** Returns a number in range [0, 1], where 1 is "complete". */ + double getProgress() const; }; } // End of namespace Id |