self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-02-15 19:36:04 +02:00
Code Issues Releases Activity

fix(web): album download progress bar (#925)

Browse Source
This commit is contained in:
Jason Rasmussen 2022-11-04 12:45:17 -04:00 committed by GitHub
parent 0d7ccc2b26
commit 86e50f97ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/apps/immich/src/api-v1/album/album.controller.ts
View File

@ -121,8 +121,9 @@ export class AlbumController {
@Param('albumId', new ParseUUIDPipe({ version: '4' })) albumId: string,
@Response({ passthrough: true }) res: Res,
): Promise<any> {
const { stream, filename } = await this.albumService.downloadArchive(authUser, albumId);
const { stream, filename, filesize } = await this.albumService.downloadArchive(authUser, albumId);
res.attachment(filename);
res.setHeader('X-Immich-Content-Length-Hint', filesize);
return stream;
}
}

3
server/apps/immich/src/api-v1/album/album.service.ts
View File

@ -171,11 +171,13 @@ export class AlbumService {
try {
const archive = archiver('zip', { store: true });
const stream = new StreamableFile(archive);
let totalSize = 0;
for (const { assetInfo } of album.assets) {
const { originalPath } = assetInfo;
const name = `${assetInfo.exifInfo?.imageName || assetInfo.id}${extname(originalPath)}`;
archive.file(originalPath, { name });
totalSize += Number(assetInfo.exifInfo?.fileSizeInByte || 0);
}
archive.finalize();
@ -183,6 +185,7 @@ export class AlbumService {
return {
stream,
filename: `${album.albumName}.zip`,
filesize: totalSize,
};
} catch (e) {
Logger.error(`Error downloading album ${e}`, 'downloadArchive');

14
web/src/lib/components/album-page/album-viewer.svelte
View File

@ -322,8 +322,20 @@
$downloadAssets[fileName] = 0;
let total = 0;
const { data, status } = await api.albumApi.downloadArchive(album.id, {
responseType: 'blob'
responseType: 'blob',
onDownloadProgress: function (progressEvent) {
const request = this as XMLHttpRequest;
if (!total) {
total = Number(request.getResponseHeader('X-Immich-Content-Length-Hint')) || 0;
}
if (total) {
const current = progressEvent.loaded;
$downloadAssets[fileName] = Math.floor((current / total) * 100);
}
}
});
if (!(data instanceof Blob)) {