High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: use browser download manager for single file downloads (#17507)
Rudhra Raveendran9e49783e491a
diff --git a/e2e/src/web/specs/shared-link.e2e-spec.ts b/e2e/src/web/specs/shared-link.e2e-spec.tsindex 9313526dab..562a0b4e8c 100644--- a/e2e/src/web/specs/shared-link.e2e-spec.ts+++ b/e2e/src/web/specs/shared-link.e2e-spec.ts@@ -48,7 +48,7 @@ test.describe('Shared Links', () => {await page.waitForSelector('[data-group] svg');await page.getByRole('checkbox').click();await page.getByRole('button', { name: 'Download' }).click();- await page.getByText('DOWNLOADING', { exact: true }).waitFor();+ await page.waitForEvent('download');});test('download all from shared link', async ({ page }) => {@@ -56,6 +56,7 @@ test.describe('Shared Links', () => {await page.getByRole('heading', { name: 'Test Album' }).waitFor();await page.getByRole('button', { name: 'Download' }).click();await page.getByText('DOWNLOADING', { exact: true }).waitFor();+ await page.waitForEvent('download');});test('enter password for a shared link', async ({ page }) => {diff --git a/web/src/lib/stores/download.ts b/web/src/lib/stores/download.tsindex ac57c76153..fc450d95ef 100644--- a/web/src/lib/stores/download.ts+++ b/web/src/lib/stores/download.ts@@ -29,6 +29,7 @@ const update = (key: string, value: Partial<DownloadProgress> | null) => {const item = newState[key];Object.assign(item, value);item.percentage = Math.min(Math.floor((item.progress / item.total) * 100), 100);+ newState[key] = { ...item };return newState;});diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.tsindex 1dcd2c95b1..c3b23e1e93 100644--- a/web/src/lib/utils/asset-utils.ts+++ b/web/src/lib/utils/asset-utils.ts@@ -162,6 +162,18 @@ export const downloadBlob = (data: Blob, filename: string) => {URL.revokeObjectURL(url);};+export const downloadUrl = (url: string, filename: string) => {+ const anchor = document.createElement('a');+ anchor.href = url;+ anchor.download = filename;++ document.body.append(anchor);+ anchor.click();+ anchor.remove();++ URL.revokeObjectURL(url);+};+export const downloadArchive = async (fileName: string, options: Omit<DownloadInfoDto, 'archiveSize'>) => {const $preferences = get<UserPreferencesResponseDto | undefined>(preferences);const dto = { ...options, archiveSize: $preferences?.download.archiveSize };@@ -238,12 +250,8 @@ export const downloadFile = async (asset: AssetResponseDto) => {}}- for (const { filename, id, size } of assets) {- const downloadKey = filename;-+ for (const { filename, id } of assets) {try {- const abort = new AbortController();- downloadManager.add(downloadKey, size, abort);const key = getKey();notificationController.show({@@ -251,20 +259,9 @@ export const downloadFile = async (asset: AssetResponseDto) => {message: $t('downloading_asset_filename', { values: { filename: asset.originalFileName } }),});- // TODO use sdk once it supports progress events- const { data } = await downloadRequest({- method: 'GET',- url: getBaseUrl() + `/assets/${id}/original` + (key ? `?key=${key}` : ''),- signal: abort.signal,- onDownloadProgress: (event) => downloadManager.update(downloadKey, event.loaded, event.total),- });-- downloadBlob(data, filename);+ downloadUrl(getBaseUrl() + `/assets/${id}/original` + (key ? `?key=${key}` : ''), filename);} catch (error) {handleError(error, $t('errors.error_downloading', { values: { filename } }));- downloadManager.clear(downloadKey);- } finally {- setTimeout(() => downloadManager.clear(downloadKey), 5000);}}};