beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

handle upload_result.cancelled in post upload action

Browse source
This commit is contained in:
Abhinav 2022-08-30 13:15:23 +05:30
parent 50f02a6fc2
commit 33fee37783
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/services/upload/uploadManager.ts
View file

@ -173,8 +173,6 @@ class UploadManager {
await this.uploadMediaFiles(allFiles);
}
UIService.setUploadStage(UPLOAD_STAGES.FINISH);
UIService.setPercentComplete(FILE_UPLOAD_COMPLETED);
} catch (e) {
if (e.message === CustomError.UPLOAD_CANCELLED) {
if (isElectron()) {
@ -189,6 +187,8 @@ class UploadManager {
throw e;
}
} finally {
UIService.setUploadStage(UPLOAD_STAGES.FINISH);
UIService.setPercentComplete(FILE_UPLOAD_COMPLETED);
for (let i = 0; i < MAX_CONCURRENT_UPLOADS; i++) {
this.cryptoWorkers[i]?.worker.terminate();
}
@ -444,8 +444,11 @@ class UploadManager {
fileWithCollection.collection.key
);
break;
case UPLOAD_RESULT.CANCELLED:
// no-op
break;
default:
// no-op
throw Error('Invalid Upload Result');
}
if (decryptedFile) {
await this.updateExistingFiles(decryptedFile);