From 863e98372628977d328852c61b429bdac803928f Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 13 Jul 2023 09:00:46 -0500
Subject: [PATCH] fix(web): download livephotos video part correctly (#3230)
---
web/src/lib/utils/asset-utils.ts | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index ff35bdb50..d420d9f57 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -88,14 +88,17 @@ export const downloadArchive = async (
};
export const downloadFile = async (asset: AssetResponseDto, key?: string) => {
- const filenames = [`${asset.originalFileName}.${getFilenameExtension(asset.originalPath)}`];
+ const assets = [{ filename: `${asset.originalFileName}.${getFilenameExtension(asset.originalPath)}`, id: asset.id }];
if (asset.livePhotoVideoId) {
- filenames.push(`${asset.originalFileName}.mov`);
+ assets.push({
+ filename: `${asset.originalFileName}.mov`,
+ id: asset.livePhotoVideoId,
+ });
}
- for (const filename of filenames) {
+ for (const asset of assets) {
try {
- updateDownload(filename, 0);
+ updateDownload(asset.filename, 0);
const { data } = await api.assetApi.downloadFile(
{ id: asset.id, key },
@@ -103,17 +106,17 @@ export const downloadFile = async (asset: AssetResponseDto, key?: string) => {
responseType: 'blob',
onDownloadProgress: (event: ProgressEvent) => {
if (event.lengthComputable) {
- updateDownload(filename, Math.floor((event.loaded / event.total) * 100));
+ updateDownload(asset.filename, Math.floor((event.loaded / event.total) * 100));
}
},
},
);
- downloadBlob(data, filename);
+ downloadBlob(data, asset.filename);
} catch (e) {
- handleError(e, `Error downloading ${filename}`);
+ handleError(e, `Error downloading ${asset.filename}`);
} finally {
- setTimeout(() => clearDownload(filename), 3_000);
+ setTimeout(() => clearDownload(asset.filename), 3_000);
}
}
};