sascha
/
immich
mirror of https://github.com/immich-app/immich.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(web): download livephotos video part correctly (#3230)

pull/3103/head
Alex 2023-07-13 09:00:46 +07:00 committed by GitHub
parent b71d7e33bb
commit 863e983726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/src/lib/utils/asset-utils.ts
Unescape Escape View File

@ -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);
}
}
};