From 493cf936cd975e48b0418dae8ad4bc1af540a408 Mon Sep 17 00:00:00 2001 From: yannfrendo Date: Wed, 29 Nov 2023 14:33:20 +0100 Subject: [PATCH] Formater + try/catch error --- .../src/infra/repositories/metadata.repository.ts | 9 +++++---- .../components/asset-viewer/detail-panel.svelte | 15 ++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/server/src/infra/repositories/metadata.repository.ts b/server/src/infra/repositories/metadata.repository.ts index e909b7bd93136..c4719d78f5a39 100644 --- a/server/src/infra/repositories/metadata.repository.ts +++ b/server/src/infra/repositories/metadata.repository.ts @@ -201,9 +201,10 @@ export class MetadataRepository implements IMetadataRepository { async writeTags(path: string, tags: Partial): Promise { - await exiftool.write(path, tags, ['-overwrite_original']).catch((error) => { - this.logger.warn(`Error writing exif data (${path}): ${error}`, error?.stack); - return null; - }); + try { + await exiftool.write(path, tags, ['-overwrite_original']); + } catch (error) { + this.logger.warn(`Error writing exif data (${path}): ${error}`); + } } } diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 9146a8b91b78e..29b91a228b6d0 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -281,8 +281,7 @@ {:else if !asset.exifInfo?.dateTimeOriginal && !asset.isReadOnly} -
+
@@ -293,10 +292,10 @@
{:else if asset.exifInfo?.dateTimeOriginal && asset.isReadOnly} - {@const assetDateTimeOriginal = DateTime.fromISO(asset.exifInfo.dateTimeOriginal, { - zone: asset.exifInfo.timeZone ?? undefined, - })} -
+ {@const assetDateTimeOriginal = DateTime.fromISO(asset.exifInfo.dateTimeOriginal, { + zone: asset.exifInfo.timeZone ?? undefined, + })} +
@@ -329,7 +328,6 @@
- {/if} {#if isShowChangeDate} @@ -462,8 +460,7 @@
{:else if asset.exifInfo?.city && asset.isReadOnly} -
+