libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 17:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKENDS: Implement interrupt/cancel pending DLC downloads

Browse Source
This commit is contained in:
Ankush Dutt 2023-08-02 15:15:46 +05:30 committed by Eugene Sandulenko
parent 5059b3072e
commit 13dc800e96
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backends/dlc/dlcmanager.cpp
View File

@ -58,6 +58,7 @@ void DLCManager::refreshLauncherGameList() {
void DLCManager::addDownload(uint32 idx) {
_dlcs[idx]->state = DLCDesc::kInProgress;
_queuedDownloadTasks.push(_dlcs[idx]);
_dlcsInProgress.push_back(_dlcs[idx]);
if (!_isDLCDownloading) {
// if queue is not already processing
DLCManager::processDownloadQueue();
@ -74,6 +75,7 @@ void DLCManager::processDownloadQueue() {
} else {
// state is already cancelled/downloaded -> skip download
_queuedDownloadTasks.pop();
_dlcsInProgress.remove_at(0);
// process next download in the queue
processDownloadQueue();
}
@ -89,8 +91,9 @@ void DLCManager::startDownloadAsync(const Common::String &id, const Common::Stri
}
bool DLCManager::cancelDownload(uint32 idx) {
if (_currentDownloadingDLC == _dlcs[idx]->id) {
if (_queuedDownloadTasks.front()->idx == idx) {
// if already downloading, interrupt startDownloadAsync
_interruptCurrentDownload = true;
} else {
// if not started, skip it in processDownload()
_dlcs[idx]->state = DLCDesc::kCancelled;

2
backends/dlc/dlcmanager.h
View File

@ -42,8 +42,10 @@ class DLCManager : public Common::Singleton<DLCManager>, public GUI::CommandSend
public:
bool _fetchDLCs = false;
bool _interruptCurrentDownload = false;
uint32 _currentDownloadedSize;
Common::Array<DLCDesc*> _dlcs;
Common::Array<DLCDesc*> _dlcsInProgress;
Common::Queue<DLCDesc*> _queuedDownloadTasks;
DLCManager();

14
backends/dlc/scummvmcloud.cpp
View File

@ -91,6 +91,18 @@ void ScummVMCloud::getAllDLCs() {
void ScummVMCloud::downloadFileCallback(Networking::DataResponse r) {
Networking::SessionFileResponse *response = static_cast<Networking::SessionFileResponse *>(r.value);
DLCMan._currentDownloadedSize += response->len;
if (DLCMan._interruptCurrentDownload) {
_rq->close();
DLCMan._interruptCurrentDownload = false;
// delete the download cache (the incomplete .zip)
Common::Path relativeFilePath = Common::Path(DLCMan._queuedDownloadTasks.front()->id);
removeCacheFile(relativeFilePath);
// handle next download
DLCMan._queuedDownloadTasks.front()->state = DLCDesc::kDownloaded;
DLCMan._queuedDownloadTasks.pop();
DLCMan._dlcsInProgress.remove_at(0);
DLCMan.processDownloadQueue();
}
if (response->eos) {
warning("downloaded");
_rq->close(); // delete request
@ -106,6 +118,7 @@ void ScummVMCloud::downloadFileCallback(Networking::DataResponse r) {
// handle next download
DLCMan._queuedDownloadTasks.front()->state = DLCDesc::kDownloaded;
DLCMan._queuedDownloadTasks.pop();
DLCMan._dlcsInProgress.remove_at(0);
DLCMan.processDownloadQueue();
}
}
@ -114,6 +127,7 @@ void ScummVMCloud::errorCallback(Networking::ErrorResponse error) {
// error downloading - start next download in queue
DLCMan._queuedDownloadTasks.front()->state = DLCDesc::kErrorDownloading;
DLCMan._queuedDownloadTasks.pop();
DLCMan._dlcsInProgress.remove_at(0);
DLCMan.processDownloadQueue();
}

7
gui/downloaddlcsdialog.cpp
View File

@ -84,9 +84,11 @@ void DownloadDLCsDialog::refreshWidgets() {
_currentDownloadLabel->setLabel(DLCMan._queuedDownloadTasks.front()->name);
_downloadedSizeLabel->setLabel(getSizeLabelText());
for (auto it : DLCMan._dlcs) {
for (auto it : DLCMan._dlcsInProgress) {
if (it->state == DLC::DLCDesc::kInProgress) {
pendingList.push_back(it->name);
} else {
pendingList.push_back("[Cancelled] " + it->name);
}
}
_pendingDownloadsList->setList(pendingList);
@ -127,7 +129,8 @@ void DownloadDLCsDialog::handleTickle() {
void DownloadDLCsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kCancelSelectedCmd: {
// set state of selected DLC to kCancelled
uint32 idx = DLCMan._dlcsInProgress[_pendingDownloadsList->getSelected()]->idx;
DLCMan.cancelDownload(idx);
}
break;
default: