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

Streamline

Browse source
This commit is contained in:
Manav Rathi 2024-04-23 20:54:57 +05:30
parent e1a3475faa
commit 5befc53d8c
No known key found for this signature in database
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,15 +240,15 @@ export const uploader = async (
const file = await readAsset(fileTypeInfo, uploadAsset);
if (file.hasStaticThumbnail) {
metadata.hasStaticThumbnail = true;
}
if (file.hasStaticThumbnail) metadata.hasStaticThumbnail = true;
const pubMagicMetadata = await constructPublicMagicMetadata({
...publicMagicMetadata,
uploaderName,
});
abortIfCancelled();
const fileWithMetadata: FileWithMetadata = {
localID,
filedata: file.filedata,
@ -257,8 +257,6 @@ export const uploader = async (
pubMagicMetadata,
};
abortIfCancelled();
const encryptedFile = await encryptFile(
worker,
fileWithMetadata,
@ -267,20 +265,18 @@ export const uploader = async (
abortIfCancelled();
const backupedFile: BackupedFile = await uploadToBucket(
const backupedFile = await uploadToBucket(
encryptedFile.file,
makeProgessTracker,
uploadService.getIsCFUploadProxyDisabled(),
);
const uploadFile: UploadFile = {
const uploadedFile = await uploadService.uploadFile({
collectionID: collection.id,
encryptedKey: encryptedFile.fileKey.encryptedData,
keyDecryptionNonce: encryptedFile.fileKey.nonce,
...backupedFile,
};
const uploadedFile = await uploadService.uploadFile(uploadFile);
});
return {
fileUploadResult: metadata.hasStaticThumbnail