From f09ca16e67840c6b9de637ce5fbd4db958ffe2bb Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Thu, 13 Aug 2026 09:25:32 +0200 Subject: [PATCH 1/3] feat: add show image exif configuration option --- .../Interfaces/IClientSettings.cs | 1 + .../Controllers/ConfigControllerTests.cs | 1 + .../Resources/TestV1.json | 1 + .../Resources/TestV2.json | 1 + ImmichFrame.WebApi.Tests/Resources/TestV2.yml | 1 + .../Helpers/Config/ServerSettingsV1.cs | 2 ++ .../Models/ClientSettingsDto.cs | 1 + ImmichFrame.WebApi/Models/ServerSettings.cs | 1 + Install_Web.md | 1 + docker/Settings.example.json | 1 + docker/Settings.example.yml | 1 + docker/example.env | 1 + docs/docs/getting-started/configuration.md | 2 ++ docs/docs/getting-started/configurationV1.md | 3 ++- .../elements/asset-component.svelte | 5 ++++ .../lib/components/elements/asset-info.svelte | 25 +++++++++++++++++-- .../src/lib/components/elements/asset.svelte | 3 +++ .../lib/components/home-page/home-page.svelte | 1 + immichFrame.Web/src/lib/immichFrameApi.ts | 1 + openApi/swagger.json | 5 +++- 20 files changed, 54 insertions(+), 4 deletions(-) diff --git a/ImmichFrame.Core/Interfaces/IClientSettings.cs b/ImmichFrame.Core/Interfaces/IClientSettings.cs index 576c13eb..3ba83917 100644 --- a/ImmichFrame.Core/Interfaces/IClientSettings.cs +++ b/ImmichFrame.Core/Interfaces/IClientSettings.cs @@ -13,6 +13,7 @@ public interface IClientSettings public bool ShowProgressBar { get; } public string? PhotoDateFormat { get; } public bool ShowImageDesc { get; } + public bool ShowImageExif { get; } public bool ShowPeopleDesc { get; } public bool ShowTagsDesc { get; } public bool ShowAlbumName { get; } diff --git a/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs b/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs index de31232a..128a7015 100644 --- a/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs +++ b/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs @@ -34,6 +34,7 @@ public void Setup() ShowProgressBar = false, PhotoDateFormat = "dd.MM.yyyy", ShowImageDesc = false, + ShowImageExif = true, ShowPeopleDesc = false, ShowTagsDesc = false, ShowAlbumName = false, diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV1.json b/ImmichFrame.WebApi.Tests/Resources/TestV1.json index e6c49102..3c6b5c6d 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV1.json +++ b/ImmichFrame.WebApi.Tests/Resources/TestV1.json @@ -42,6 +42,7 @@ "ShowPhotoDate": true, "PhotoDateFormat": "PhotoDateFormat_TEST", "ShowImageDesc": true, + "ShowImageExif": true, "ShowPeopleDesc": true, "ShowImageLocation": true, "ImageLocationFormat": "ImageLocationFormat_TEST", diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV2.json b/ImmichFrame.WebApi.Tests/Resources/TestV2.json index 4d603dc9..ee38b78d 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV2.json +++ b/ImmichFrame.WebApi.Tests/Resources/TestV2.json @@ -22,6 +22,7 @@ "ShowProgressBar": true, "ShowPhotoDate": true, "ShowImageDesc": true, + "ShowImageExif": true, "ShowPeopleDesc": true, "ShowAlbumName": true, "ShowImageLocation": true, diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV2.yml b/ImmichFrame.WebApi.Tests/Resources/TestV2.yml index 47f45947..679a7935 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV2.yml +++ b/ImmichFrame.WebApi.Tests/Resources/TestV2.yml @@ -21,6 +21,7 @@ General: ShowProgressBar: true ShowPhotoDate: true ShowImageDesc: true + ShowImageExif: true ShowPeopleDesc: true ShowAlbumName: true ShowImageLocation: true diff --git a/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs b/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs index 076f36da..7e6e2f65 100644 --- a/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs +++ b/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs @@ -40,6 +40,7 @@ public class ServerSettingsV1 : IConfigSettable public bool ShowPhotoDate { get; set; } = true; public string? PhotoDateFormat { get; set; } = "MM/dd/yyyy"; public bool ShowImageDesc { get; set; } = true; + public bool ShowImageExif { get; set; } = false; public bool ShowPeopleDesc { get; set; } = true; public bool ShowTagsDesc { get; set; } = true; public bool ShowAlbumName { get; set; } = true; @@ -118,6 +119,7 @@ class GeneralSettingsV1Adapter(ServerSettingsV1 _delegate) : IGeneralSettings public bool ShowPhotoDate => _delegate.ShowPhotoDate; public string? PhotoDateFormat => _delegate.PhotoDateFormat; public bool ShowImageDesc => _delegate.ShowImageDesc; + public bool ShowImageExif => _delegate.ShowImageExif; public bool ShowPeopleDesc => _delegate.ShowPeopleDesc; public bool ShowTagsDesc => _delegate.ShowTagsDesc; public bool ShowAlbumName => _delegate.ShowAlbumName; diff --git a/ImmichFrame.WebApi/Models/ClientSettingsDto.cs b/ImmichFrame.WebApi/Models/ClientSettingsDto.cs index 5e408fe9..5a5ae3d9 100644 --- a/ImmichFrame.WebApi/Models/ClientSettingsDto.cs +++ b/ImmichFrame.WebApi/Models/ClientSettingsDto.cs @@ -15,6 +15,7 @@ public class ClientSettingsDto(IClientSettings settings) : IClientSettings public bool ShowProgressBar => settings.ShowProgressBar; public string? PhotoDateFormat => settings.PhotoDateFormat; public bool ShowImageDesc => settings.ShowImageDesc; + public bool ShowImageExif => settings.ShowImageExif; public bool ShowPeopleDesc => settings.ShowPeopleDesc; public bool ShowTagsDesc => settings.ShowTagsDesc; public bool ShowAlbumName => settings.ShowAlbumName; diff --git a/ImmichFrame.WebApi/Models/ServerSettings.cs b/ImmichFrame.WebApi/Models/ServerSettings.cs index 74d0fb8e..a0f32661 100644 --- a/ImmichFrame.WebApi/Models/ServerSettings.cs +++ b/ImmichFrame.WebApi/Models/ServerSettings.cs @@ -49,6 +49,7 @@ public class GeneralSettings : IGeneralSettings, IConfigSettable public bool ShowProgressBar { get; set; } = true; public bool ShowPhotoDate { get; set; } = true; public bool ShowImageDesc { get; set; } = true; + public bool ShowImageExif { get; set; } = false; public bool ShowPeopleDesc { get; set; } = true; public bool ShowTagsDesc { get; set; } = true; public bool ShowAlbumName { get; set; } = true; diff --git a/Install_Web.md b/Install_Web.md index 5cf3f94c..1a5b69d7 100644 --- a/Install_Web.md +++ b/Install_Web.md @@ -66,6 +66,7 @@ services: # ShowPhotoDate: "true" # PhotoDateFormat: "yyyy-MM-dd" # ShowImageDesc: "true" + # ShowImageExif: "false" # ShowPeopleDesc: "true" # ShowAlbumName: "true" # ShowImageLocation: "true" diff --git a/docker/Settings.example.json b/docker/Settings.example.json index a86a4d00..ffc5fe90 100644 --- a/docker/Settings.example.json +++ b/docker/Settings.example.json @@ -22,6 +22,7 @@ "ShowProgressBar": true, "ShowPhotoDate": true, "ShowImageDesc": true, + "ShowImageExif": false, "ShowPeopleDesc": true, "ShowAlbumName": true, "ShowImageLocation": true, diff --git a/docker/Settings.example.yml b/docker/Settings.example.yml index 173b31a5..3fd07481 100644 --- a/docker/Settings.example.yml +++ b/docker/Settings.example.yml @@ -20,6 +20,7 @@ General: ShowProgressBar: true ShowPhotoDate: true ShowImageDesc: true + ShowImageExif: false ShowPeopleDesc: true ShowAlbumName: true ShowImageLocation: true diff --git a/docker/example.env b/docker/example.env index 51d80ed5..ea5e2f92 100644 --- a/docker/example.env +++ b/docker/example.env @@ -33,6 +33,7 @@ ApiKey=KEY # ShowPhotoDate=true # PhotoDateFormat=yyyy-MM-dd # ShowImageDesc=true +# ShowImageExif=false # ShowPeopleDesc=true # ShowAlbumName=true # ShowImageLocation=true diff --git a/docs/docs/getting-started/configuration.md b/docs/docs/getting-started/configuration.md index 7378c7d1..58698d64 100644 --- a/docs/docs/getting-started/configuration.md +++ b/docs/docs/getting-started/configuration.md @@ -74,6 +74,8 @@ General: ShowPhotoDate: true # boolean # Displays the description of the current image. ShowImageDesc: true # boolean + # Displays image EXIF details: f-number, shutter speed, focal length, and ISO. + ShowImageExif: false # boolean # Displays a comma separated list of names of all the people that are assigned in immich. ShowPeopleDesc: true # boolean # Displays a comma separated list of names of all the tags that are assigned in immich. diff --git a/docs/docs/getting-started/configurationV1.md b/docs/docs/getting-started/configurationV1.md index bf9ca932..a2a2e770 100644 --- a/docs/docs/getting-started/configurationV1.md +++ b/docs/docs/getting-started/configurationV1.md @@ -40,6 +40,7 @@ sidebar_position: 4 | Clock | ClockDateFormat | string | eee, MMM d | Date format for the clock. | | [Calendar](#calendar) | Webcalendars | string[] | [] | A list of webcalendar URIs in the .ics format. e.g. https://calendar.google.com/calendar/ical/XXXXXX/public/basic.ics | | [Metadata](#metadata) | ShowImageDesc | boolean | true | Displays the description of the current image. | +| [Metadata](#metadata) | ShowImageExif | boolean | false | Displays image EXIF details: f-number, shutter speed, focal length, and ISO. | | [Metadata](#metadata) | ShowPeopleDesc | boolean | true | Displays a comma separated list of names of all the people that are assigned in immich. | | [Metadata](#metadata) | ShowAlbumName | boolean | true | Displays a comma separated list of names of all the albums for an image. | | [Metadata](#metadata) | ShowImageLocation | boolean | true | Displays the location of the current image. | @@ -111,4 +112,4 @@ volumes: ``` [openweathermap-url]: https://openweathermap.org/appid -[immich-api-url]: https://immich.app/docs/features/command-line-interface#obtain-the-api-key \ No newline at end of file +[immich-api-url]: https://immich.app/docs/features/command-line-interface#obtain-the-api-key diff --git a/immichFrame.Web/src/lib/components/elements/asset-component.svelte b/immichFrame.Web/src/lib/components/elements/asset-component.svelte index 13ed3901..030d0677 100644 --- a/immichFrame.Web/src/lib/components/elements/asset-component.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset-component.svelte @@ -22,6 +22,7 @@ showLocation?: boolean; showPhotoDate?: boolean; showImageDesc?: boolean; + showImageExif?: boolean; showPeopleDesc?: boolean; showTagsDesc?: boolean; showAlbumName?: boolean; @@ -45,6 +46,7 @@ showLocation = true, showPhotoDate = true, showImageDesc = true, + showImageExif = false, showPeopleDesc = true, showTagsDesc = true, showAlbumName = true, @@ -111,6 +113,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageExif} {showPeopleDesc} {showTagsDesc} {showAlbumName} @@ -133,6 +136,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageExif} {showPeopleDesc} {showTagsDesc} {showAlbumName} @@ -157,6 +161,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageExif} {showPeopleDesc} {showTagsDesc} {showAlbumName} diff --git a/immichFrame.Web/src/lib/components/elements/asset-info.svelte b/immichFrame.Web/src/lib/components/elements/asset-info.svelte index a3aa3885..81ebf69a 100644 --- a/immichFrame.Web/src/lib/components/elements/asset-info.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset-info.svelte @@ -4,7 +4,7 @@ import * as locale from 'date-fns/locale'; import { configStore } from '$lib/stores/config.store'; import Icon from './icon.svelte'; - import { mdiCalendar, mdiMapMarker, mdiAccount, mdiText, mdiImageAlbum, mdiTag } from '@mdi/js'; + import { mdiCalendar, mdiMapMarker, mdiAccount, mdiText, mdiImageAlbum, mdiTag, mdiCameraIris } from '@mdi/js'; interface Props { asset: AssetResponseDto; @@ -12,6 +12,7 @@ showLocation: boolean; showPhotoDate: boolean; showImageDesc: boolean; + showImageExif: boolean; showPeopleDesc: boolean; showTagsDesc: boolean; showAlbumName: boolean; @@ -24,6 +25,7 @@ showLocation, showPhotoDate, showImageDesc, + showImageExif, showPeopleDesc, showTagsDesc, showAlbumName, @@ -46,6 +48,11 @@ return Array.from(locationParts).join(', '); } + + function trimFloat(value: number) { + return value.toFixed(2).replace(/\.?0+$/, ''); + } + let assetDate = $derived(asset.exifInfo?.dateTimeOriginal); let desc = $derived(asset.exifInfo?.description ?? ''); let time = $derived(assetDate ? new Date(assetDate) : null); @@ -66,11 +73,19 @@ asset.exifInfo?.country ?? '' ) ); + let imageExif = $derived( + [ + asset.exifInfo?.fNumber ? `ƒ/${asset.exifInfo.fNumber.toFixed(1)}` : null, + asset.exifInfo?.exposureTime ? `${asset.exifInfo.exposureTime}s` : null, + asset.exifInfo?.focalLength ? `${trimFloat(asset.exifInfo.focalLength)}mm` : null, + asset.exifInfo?.iso ? `ISO ${asset.exifInfo.iso}` : null + ].filter((item): item is string => item !== null) + ); let availablePeople = $derived(asset.people?.filter((x) => x.name)); let availableTags = $derived(asset.tags?.filter((x) => x.name)); -{#if showPhotoDate || showLocation || showImageDesc || showPeopleDesc || showTagsDesc || showAlbumName} +{#if showPhotoDate || showLocation || showImageDesc || showImageExif || showPeopleDesc || showTagsDesc || showAlbumName}
{desc}

{/if} + {#if showImageExif && imageExif.length > 0} +

+ + {imageExif.join(' | ')} +

+ {/if} {#if showAlbumName && albums && albums.length > 0}

diff --git a/immichFrame.Web/src/lib/components/elements/asset.svelte b/immichFrame.Web/src/lib/components/elements/asset.svelte index 7df465b8..cb2cac78 100644 --- a/immichFrame.Web/src/lib/components/elements/asset.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset.svelte @@ -21,6 +21,7 @@ showLocation: boolean; showPhotoDate: boolean; showImageDesc: boolean; + showImageExif: boolean; showPeopleDesc: boolean; showTagsDesc: boolean; showAlbumName: boolean; @@ -41,6 +42,7 @@ showLocation, showPhotoDate, showImageDesc, + showImageExif, showPeopleDesc, showTagsDesc, showAlbumName, @@ -288,6 +290,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageExif} {showPeopleDesc} {showTagsDesc} {showAlbumName} diff --git a/immichFrame.Web/src/lib/components/home-page/home-page.svelte b/immichFrame.Web/src/lib/components/home-page/home-page.svelte index fa91b97e..9de39928 100644 --- a/immichFrame.Web/src/lib/components/home-page/home-page.svelte +++ b/immichFrame.Web/src/lib/components/home-page/home-page.svelte @@ -504,6 +504,7 @@ interval={currentDuration} showPhotoDate={$configStore.showPhotoDate} showImageDesc={$configStore.showImageDesc} + showImageExif={$configStore.showImageExif} showPeopleDesc={$configStore.showPeopleDesc} showTagsDesc={$configStore.showTagsDesc} showAlbumName={$configStore.showAlbumName} diff --git a/immichFrame.Web/src/lib/immichFrameApi.ts b/immichFrame.Web/src/lib/immichFrameApi.ts index 85fa762b..2f593905 100644 --- a/immichFrame.Web/src/lib/immichFrameApi.ts +++ b/immichFrame.Web/src/lib/immichFrameApi.ts @@ -211,6 +211,7 @@ export type ClientSettingsDto = { showProgressBar?: boolean; photoDateFormat?: string | null; showImageDesc?: boolean; + showImageExif?: boolean; showPeopleDesc?: boolean; showTagsDesc?: boolean; showAlbumName?: boolean; diff --git a/openApi/swagger.json b/openApi/swagger.json index 9569c297..64c54216 100644 --- a/openApi/swagger.json +++ b/openApi/swagger.json @@ -1034,6 +1034,9 @@ "showImageDesc": { "type": "boolean" }, + "showImageExif": { + "type": "boolean" + }, "showPeopleDesc": { "type": "boolean" }, @@ -1527,4 +1530,4 @@ } } } -} \ No newline at end of file +} From 3a0192a55d4f05fde8e7202a512a65d1521ced2a Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Thu, 13 Aug 2026 09:44:53 +0200 Subject: [PATCH 2/3] feat: add show image camera configuration option --- .../Interfaces/IClientSettings.cs | 1 + .../Controllers/ConfigControllerTests.cs | 1 + .../Resources/TestV1.json | 1 + .../Resources/TestV2.json | 1 + ImmichFrame.WebApi.Tests/Resources/TestV2.yml | 1 + .../Helpers/Config/ServerSettingsV1.cs | 2 + .../Models/ClientSettingsDto.cs | 1 + ImmichFrame.WebApi/Models/ServerSettings.cs | 1 + Install_Web.md | 1 + docker/Settings.example.json | 1 + docker/Settings.example.yml | 1 + docker/example.env | 1 + docs/docs/getting-started/configuration.md | 2 + docs/docs/getting-started/configurationV1.md | 1 + .../elements/asset-component.svelte | 5 ++ .../lib/components/elements/asset-info.svelte | 53 ++++++++++++++++--- .../src/lib/components/elements/asset.svelte | 3 ++ .../lib/components/home-page/home-page.svelte | 1 + immichFrame.Web/src/lib/immichFrameApi.ts | 1 + openApi/swagger.json | 3 ++ 20 files changed, 76 insertions(+), 6 deletions(-) diff --git a/ImmichFrame.Core/Interfaces/IClientSettings.cs b/ImmichFrame.Core/Interfaces/IClientSettings.cs index 3ba83917..410423f7 100644 --- a/ImmichFrame.Core/Interfaces/IClientSettings.cs +++ b/ImmichFrame.Core/Interfaces/IClientSettings.cs @@ -13,6 +13,7 @@ public interface IClientSettings public bool ShowProgressBar { get; } public string? PhotoDateFormat { get; } public bool ShowImageDesc { get; } + public bool ShowImageCamera { get; } public bool ShowImageExif { get; } public bool ShowPeopleDesc { get; } public bool ShowTagsDesc { get; } diff --git a/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs b/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs index 128a7015..ad9e32bd 100644 --- a/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs +++ b/ImmichFrame.WebApi.Tests/Controllers/ConfigControllerTests.cs @@ -34,6 +34,7 @@ public void Setup() ShowProgressBar = false, PhotoDateFormat = "dd.MM.yyyy", ShowImageDesc = false, + ShowImageCamera = true, ShowImageExif = true, ShowPeopleDesc = false, ShowTagsDesc = false, diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV1.json b/ImmichFrame.WebApi.Tests/Resources/TestV1.json index 3c6b5c6d..506b98a0 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV1.json +++ b/ImmichFrame.WebApi.Tests/Resources/TestV1.json @@ -42,6 +42,7 @@ "ShowPhotoDate": true, "PhotoDateFormat": "PhotoDateFormat_TEST", "ShowImageDesc": true, + "ShowImageCamera": true, "ShowImageExif": true, "ShowPeopleDesc": true, "ShowImageLocation": true, diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV2.json b/ImmichFrame.WebApi.Tests/Resources/TestV2.json index ee38b78d..444ae82a 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV2.json +++ b/ImmichFrame.WebApi.Tests/Resources/TestV2.json @@ -22,6 +22,7 @@ "ShowProgressBar": true, "ShowPhotoDate": true, "ShowImageDesc": true, + "ShowImageCamera": true, "ShowImageExif": true, "ShowPeopleDesc": true, "ShowAlbumName": true, diff --git a/ImmichFrame.WebApi.Tests/Resources/TestV2.yml b/ImmichFrame.WebApi.Tests/Resources/TestV2.yml index 679a7935..a61228e1 100644 --- a/ImmichFrame.WebApi.Tests/Resources/TestV2.yml +++ b/ImmichFrame.WebApi.Tests/Resources/TestV2.yml @@ -21,6 +21,7 @@ General: ShowProgressBar: true ShowPhotoDate: true ShowImageDesc: true + ShowImageCamera: true ShowImageExif: true ShowPeopleDesc: true ShowAlbumName: true diff --git a/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs b/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs index 7e6e2f65..e1f77e8a 100644 --- a/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs +++ b/ImmichFrame.WebApi/Helpers/Config/ServerSettingsV1.cs @@ -40,6 +40,7 @@ public class ServerSettingsV1 : IConfigSettable public bool ShowPhotoDate { get; set; } = true; public string? PhotoDateFormat { get; set; } = "MM/dd/yyyy"; public bool ShowImageDesc { get; set; } = true; + public bool ShowImageCamera { get; set; } = false; public bool ShowImageExif { get; set; } = false; public bool ShowPeopleDesc { get; set; } = true; public bool ShowTagsDesc { get; set; } = true; @@ -119,6 +120,7 @@ class GeneralSettingsV1Adapter(ServerSettingsV1 _delegate) : IGeneralSettings public bool ShowPhotoDate => _delegate.ShowPhotoDate; public string? PhotoDateFormat => _delegate.PhotoDateFormat; public bool ShowImageDesc => _delegate.ShowImageDesc; + public bool ShowImageCamera => _delegate.ShowImageCamera; public bool ShowImageExif => _delegate.ShowImageExif; public bool ShowPeopleDesc => _delegate.ShowPeopleDesc; public bool ShowTagsDesc => _delegate.ShowTagsDesc; diff --git a/ImmichFrame.WebApi/Models/ClientSettingsDto.cs b/ImmichFrame.WebApi/Models/ClientSettingsDto.cs index 5a5ae3d9..075d1f86 100644 --- a/ImmichFrame.WebApi/Models/ClientSettingsDto.cs +++ b/ImmichFrame.WebApi/Models/ClientSettingsDto.cs @@ -15,6 +15,7 @@ public class ClientSettingsDto(IClientSettings settings) : IClientSettings public bool ShowProgressBar => settings.ShowProgressBar; public string? PhotoDateFormat => settings.PhotoDateFormat; public bool ShowImageDesc => settings.ShowImageDesc; + public bool ShowImageCamera => settings.ShowImageCamera; public bool ShowImageExif => settings.ShowImageExif; public bool ShowPeopleDesc => settings.ShowPeopleDesc; public bool ShowTagsDesc => settings.ShowTagsDesc; diff --git a/ImmichFrame.WebApi/Models/ServerSettings.cs b/ImmichFrame.WebApi/Models/ServerSettings.cs index a0f32661..c529ee13 100644 --- a/ImmichFrame.WebApi/Models/ServerSettings.cs +++ b/ImmichFrame.WebApi/Models/ServerSettings.cs @@ -49,6 +49,7 @@ public class GeneralSettings : IGeneralSettings, IConfigSettable public bool ShowProgressBar { get; set; } = true; public bool ShowPhotoDate { get; set; } = true; public bool ShowImageDesc { get; set; } = true; + public bool ShowImageCamera { get; set; } = false; public bool ShowImageExif { get; set; } = false; public bool ShowPeopleDesc { get; set; } = true; public bool ShowTagsDesc { get; set; } = true; diff --git a/Install_Web.md b/Install_Web.md index 1a5b69d7..7cfe0da6 100644 --- a/Install_Web.md +++ b/Install_Web.md @@ -66,6 +66,7 @@ services: # ShowPhotoDate: "true" # PhotoDateFormat: "yyyy-MM-dd" # ShowImageDesc: "true" + # ShowImageCamera: "false" # ShowImageExif: "false" # ShowPeopleDesc: "true" # ShowAlbumName: "true" diff --git a/docker/Settings.example.json b/docker/Settings.example.json index ffc5fe90..940baad8 100644 --- a/docker/Settings.example.json +++ b/docker/Settings.example.json @@ -22,6 +22,7 @@ "ShowProgressBar": true, "ShowPhotoDate": true, "ShowImageDesc": true, + "ShowImageCamera": false, "ShowImageExif": false, "ShowPeopleDesc": true, "ShowAlbumName": true, diff --git a/docker/Settings.example.yml b/docker/Settings.example.yml index 3fd07481..5a53e201 100644 --- a/docker/Settings.example.yml +++ b/docker/Settings.example.yml @@ -20,6 +20,7 @@ General: ShowProgressBar: true ShowPhotoDate: true ShowImageDesc: true + ShowImageCamera: false ShowImageExif: false ShowPeopleDesc: true ShowAlbumName: true diff --git a/docker/example.env b/docker/example.env index ea5e2f92..38169c8d 100644 --- a/docker/example.env +++ b/docker/example.env @@ -33,6 +33,7 @@ ApiKey=KEY # ShowPhotoDate=true # PhotoDateFormat=yyyy-MM-dd # ShowImageDesc=true +# ShowImageCamera=false # ShowImageExif=false # ShowPeopleDesc=true # ShowAlbumName=true diff --git a/docs/docs/getting-started/configuration.md b/docs/docs/getting-started/configuration.md index 58698d64..e9c788a6 100644 --- a/docs/docs/getting-started/configuration.md +++ b/docs/docs/getting-started/configuration.md @@ -74,6 +74,8 @@ General: ShowPhotoDate: true # boolean # Displays the description of the current image. ShowImageDesc: true # boolean + # Displays camera make and model for the current image. + ShowImageCamera: false # boolean # Displays image EXIF details: f-number, shutter speed, focal length, and ISO. ShowImageExif: false # boolean # Displays a comma separated list of names of all the people that are assigned in immich. diff --git a/docs/docs/getting-started/configurationV1.md b/docs/docs/getting-started/configurationV1.md index a2a2e770..1ab32d10 100644 --- a/docs/docs/getting-started/configurationV1.md +++ b/docs/docs/getting-started/configurationV1.md @@ -40,6 +40,7 @@ sidebar_position: 4 | Clock | ClockDateFormat | string | eee, MMM d | Date format for the clock. | | [Calendar](#calendar) | Webcalendars | string[] | [] | A list of webcalendar URIs in the .ics format. e.g. https://calendar.google.com/calendar/ical/XXXXXX/public/basic.ics | | [Metadata](#metadata) | ShowImageDesc | boolean | true | Displays the description of the current image. | +| [Metadata](#metadata) | ShowImageCamera | boolean | false | Displays camera make and model for the current image. | | [Metadata](#metadata) | ShowImageExif | boolean | false | Displays image EXIF details: f-number, shutter speed, focal length, and ISO. | | [Metadata](#metadata) | ShowPeopleDesc | boolean | true | Displays a comma separated list of names of all the people that are assigned in immich. | | [Metadata](#metadata) | ShowAlbumName | boolean | true | Displays a comma separated list of names of all the albums for an image. | diff --git a/immichFrame.Web/src/lib/components/elements/asset-component.svelte b/immichFrame.Web/src/lib/components/elements/asset-component.svelte index 030d0677..092eb4c4 100644 --- a/immichFrame.Web/src/lib/components/elements/asset-component.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset-component.svelte @@ -22,6 +22,7 @@ showLocation?: boolean; showPhotoDate?: boolean; showImageDesc?: boolean; + showImageCamera?: boolean; showImageExif?: boolean; showPeopleDesc?: boolean; showTagsDesc?: boolean; @@ -46,6 +47,7 @@ showLocation = true, showPhotoDate = true, showImageDesc = true, + showImageCamera = false, showImageExif = false, showPeopleDesc = true, showTagsDesc = true, @@ -113,6 +115,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageCamera} {showImageExif} {showPeopleDesc} {showTagsDesc} @@ -136,6 +139,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageCamera} {showImageExif} {showPeopleDesc} {showTagsDesc} @@ -161,6 +165,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageCamera} {showImageExif} {showPeopleDesc} {showTagsDesc} diff --git a/immichFrame.Web/src/lib/components/elements/asset-info.svelte b/immichFrame.Web/src/lib/components/elements/asset-info.svelte index 81ebf69a..5c9fcc06 100644 --- a/immichFrame.Web/src/lib/components/elements/asset-info.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset-info.svelte @@ -4,7 +4,16 @@ import * as locale from 'date-fns/locale'; import { configStore } from '$lib/stores/config.store'; import Icon from './icon.svelte'; - import { mdiCalendar, mdiMapMarker, mdiAccount, mdiText, mdiImageAlbum, mdiTag, mdiCameraIris } from '@mdi/js'; + import { + mdiCalendar, + mdiMapMarker, + mdiAccount, + mdiText, + mdiImageAlbum, + mdiTag, + mdiCamera, + mdiCameraIris + } from '@mdi/js'; interface Props { asset: AssetResponseDto; @@ -12,6 +21,7 @@ showLocation: boolean; showPhotoDate: boolean; showImageDesc: boolean; + showImageCamera: boolean; showImageExif: boolean; showPeopleDesc: boolean; showTagsDesc: boolean; @@ -25,11 +35,12 @@ showLocation, showPhotoDate, showImageDesc, + showImageCamera, showImageExif, showPeopleDesc, showTagsDesc, showAlbumName, - split, + split }: Props = $props(); function formatLocation(format: string, city?: string, state?: string, country?: string) { @@ -53,6 +64,23 @@ return value.toFixed(2).replace(/\.?0+$/, ''); } + function containsWholeWord(value: string, word: string) { + if (!word) return false; + const escaped = word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + return new RegExp(`(^|\\s)${escaped}(?=\\s|$)`, 'i').test(value); + } + + function formatCamera(make?: string | null, model?: string | null) { + const trimmedMake = make?.trim() ?? ''; + const trimmedModel = model?.trim() ?? ''; + + if (containsWholeWord(trimmedMake, trimmedModel)) { + return trimmedModel; + } + + return `${trimmedMake} ${trimmedModel}`.trim(); + } + let assetDate = $derived(asset.exifInfo?.dateTimeOriginal); let desc = $derived(asset.exifInfo?.description ?? ''); let time = $derived(assetDate ? new Date(assetDate) : null); @@ -73,6 +101,7 @@ asset.exifInfo?.country ?? '' ) ); + let imageCamera = $derived(formatCamera(asset.exifInfo?.make, asset.exifInfo?.model)); let imageExif = $derived( [ asset.exifInfo?.fNumber ? `ƒ/${asset.exifInfo.fNumber.toFixed(1)}` : null, @@ -85,7 +114,7 @@ let availableTags = $derived(asset.tags?.filter((x) => x.name)); -{#if showPhotoDate || showLocation || showImageDesc || showImageExif || showPeopleDesc || showTagsDesc || showAlbumName} +{#if showPhotoDate || showLocation || showImageDesc || showImageCamera || showImageExif || showPeopleDesc || showTagsDesc || showAlbumName}

{desc}

{/if} + {#if showImageCamera && imageCamera} +

+ + {imageCamera} +

+ {/if} {#if showImageExif && imageExif.length > 0}

@@ -114,19 +149,25 @@ {#if showAlbumName && albums && albums.length > 0}

- {albums.map((x) => x.albumName).join(', ')} + {albums.map((x) => x.albumName).join(', ')}

{/if} {#if showPeopleDesc && availablePeople && availablePeople.length > 0}

- {availablePeople.map((x) => x.name).join(', ')} + {availablePeople.map((x) => x.name).join(', ')}

{/if} {#if showTagsDesc && availableTags && availableTags.length > 0}

- {availableTags.map((x) => x.name).join(', ')} + {availableTags.map((x) => x.name).join(', ')}

{/if} {#if showLocation && location} diff --git a/immichFrame.Web/src/lib/components/elements/asset.svelte b/immichFrame.Web/src/lib/components/elements/asset.svelte index cb2cac78..8d9220cc 100644 --- a/immichFrame.Web/src/lib/components/elements/asset.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset.svelte @@ -21,6 +21,7 @@ showLocation: boolean; showPhotoDate: boolean; showImageDesc: boolean; + showImageCamera: boolean; showImageExif: boolean; showPeopleDesc: boolean; showTagsDesc: boolean; @@ -42,6 +43,7 @@ showLocation, showPhotoDate, showImageDesc, + showImageCamera, showImageExif, showPeopleDesc, showTagsDesc, @@ -290,6 +292,7 @@ {showLocation} {showPhotoDate} {showImageDesc} + {showImageCamera} {showImageExif} {showPeopleDesc} {showTagsDesc} diff --git a/immichFrame.Web/src/lib/components/home-page/home-page.svelte b/immichFrame.Web/src/lib/components/home-page/home-page.svelte index 9de39928..b8cf0d4d 100644 --- a/immichFrame.Web/src/lib/components/home-page/home-page.svelte +++ b/immichFrame.Web/src/lib/components/home-page/home-page.svelte @@ -504,6 +504,7 @@ interval={currentDuration} showPhotoDate={$configStore.showPhotoDate} showImageDesc={$configStore.showImageDesc} + showImageCamera={$configStore.showImageCamera} showImageExif={$configStore.showImageExif} showPeopleDesc={$configStore.showPeopleDesc} showTagsDesc={$configStore.showTagsDesc} diff --git a/immichFrame.Web/src/lib/immichFrameApi.ts b/immichFrame.Web/src/lib/immichFrameApi.ts index 2f593905..e4064c1c 100644 --- a/immichFrame.Web/src/lib/immichFrameApi.ts +++ b/immichFrame.Web/src/lib/immichFrameApi.ts @@ -211,6 +211,7 @@ export type ClientSettingsDto = { showProgressBar?: boolean; photoDateFormat?: string | null; showImageDesc?: boolean; + showImageCamera?: boolean; showImageExif?: boolean; showPeopleDesc?: boolean; showTagsDesc?: boolean; diff --git a/openApi/swagger.json b/openApi/swagger.json index 64c54216..eb08dba6 100644 --- a/openApi/swagger.json +++ b/openApi/swagger.json @@ -1034,6 +1034,9 @@ "showImageDesc": { "type": "boolean" }, + "showImageCamera": { + "type": "boolean" + }, "showImageExif": { "type": "boolean" }, From a6cdb8e44c81a68bbcc86085244efe5421c9e26d Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Thu, 13 Aug 2026 14:18:48 +0200 Subject: [PATCH 3/3] address review comments --- immichFrame.Web/src/lib/components/elements/asset-info.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/immichFrame.Web/src/lib/components/elements/asset-info.svelte b/immichFrame.Web/src/lib/components/elements/asset-info.svelte index 5c9fcc06..54b790c8 100644 --- a/immichFrame.Web/src/lib/components/elements/asset-info.svelte +++ b/immichFrame.Web/src/lib/components/elements/asset-info.svelte @@ -74,7 +74,7 @@ const trimmedMake = make?.trim() ?? ''; const trimmedModel = model?.trim() ?? ''; - if (containsWholeWord(trimmedMake, trimmedModel)) { + if (containsWholeWord(trimmedModel, trimmedMake)) { return trimmedModel; }