From f25809befbc55f881890bfaf519f6489e79afad4 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 22 Dec 2022 13:29:51 -0600 Subject: [PATCH] feat(web) using template filename for downloaded file (#1164) * feat(web) using template filename for downloaded file * remove deadcode --- .../asset-viewer/asset-viewer.svelte | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index a6ce7b7f3d..feae8aca1c 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -21,6 +21,7 @@ notificationController, NotificationType } from '../shared-components/notification/notification'; + import { assetStore } from '$lib/stores/assets.store'; export let asset: AssetResponseDto; @@ -98,11 +99,24 @@ downloadFile(asset.id, false); }; + /** + * Get the filename of the asset based on the user defined template + */ + const getTemplateFilename = () => { + const filenameWithExtension = asset.originalPath.split('/').pop() as string; + const filenameWithoutExtension = filenameWithExtension.split('.')[0]; + return { + filenameWithExtension, + filenameWithoutExtension + }; + }; + const downloadFile = async (assetId: string, isLivePhoto: boolean) => { try { - const imageName = asset.exifInfo?.imageName ? asset.exifInfo?.imageName : asset.id; + const { filenameWithoutExtension } = getTemplateFilename(); + const imageExtension = isLivePhoto ? 'mov' : asset.originalPath.split('.')[1]; - const imageFileName = imageName + '.' + imageExtension; + const imageFileName = filenameWithoutExtension + '.' + imageExtension; // If assets is already download -> return; if ($downloadAssets[imageFileName]) {