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

Streamlined

Browse source
This commit is contained in:
Manav Rathi 2024-04-23 20:39:16 +05:30
parent c401b9a938
commit 86a102c47d
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
web/apps/photos/src/services/upload/uploadService.ts
View file

@ -185,6 +185,11 @@ export const uploader = async (
const name = assetName(fileWithCollection);
log.info(`Uploading ${name}`);
const abortIfCancelled = () => {
if (uploadCancelService.isUploadCancelationRequested())
throw Error(CustomError.UPLOAD_CANCELLED);
};
const { collection, localID, ...uploadAsset2 } = fileWithCollection;
/* TODO(MR): ElectronFile changes */
const uploadAsset = uploadAsset2 as UploadAsset;
@ -242,9 +247,8 @@ export const uploader = async (
};
}
}
if (uploadCancelService.isUploadCancelationRequested()) {
throw Error(CustomError.UPLOAD_CANCELLED);
}
abortIfCancelled();
const file = await readAsset(fileTypeInfo, uploadAsset);
@ -265,9 +269,7 @@ export const uploader = async (
pubMagicMetadata,
};
if (uploadCancelService.isUploadCancelationRequested()) {
throw Error(CustomError.UPLOAD_CANCELLED);
}
abortIfCancelled();
const encryptedFile = await encryptFile(
worker,
@ -275,9 +277,7 @@ export const uploader = async (
collection.key,
);
if (uploadCancelService.isUploadCancelationRequested()) {
throw Error(CustomError.UPLOAD_CANCELLED);
}
abortIfCancelled();
const backupedFile: BackupedFile = await uploadToBucket(
encryptedFile.file,