High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat(server): Support camera `make`, `model`, and `lensModel` in Storage Template (#24650)
Rahul Kumar Sainia16c5955d725
diff --git a/server/src/queries/asset.job.repository.sql b/server/src/queries/asset.job.repository.sqlindex b736998e28..ae2b5110c2 100644--- a/server/src/queries/asset.job.repository.sql+++ b/server/src/queries/asset.job.repository.sql@@ -493,6 +493,9 @@ select"asset"."fileCreatedAt","asset_exif"."timeZone","asset_exif"."fileSizeInByte",+ "asset_exif"."make",+ "asset_exif"."model",+ "asset_exif"."lensModel",(selectcoalesce(json_agg(agg), '[]')@@ -529,6 +532,9 @@ select"asset"."fileCreatedAt","asset_exif"."timeZone","asset_exif"."fileSizeInByte",+ "asset_exif"."make",+ "asset_exif"."model",+ "asset_exif"."lensModel",(selectcoalesce(json_agg(agg), '[]')diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.tsindex 214d42747f..8beb053aac 100644--- a/server/src/repositories/asset-job.repository.ts+++ b/server/src/repositories/asset-job.repository.ts@@ -324,6 +324,9 @@ export class AssetJobRepository {'asset.fileCreatedAt','asset_exif.timeZone','asset_exif.fileSizeInByte',+ 'asset_exif.make',+ 'asset_exif.model',+ 'asset_exif.lensModel',]).select((eb) => withFiles(eb, AssetFileType.Sidecar)).where('asset.deletedAt', 'is', null);diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.tsindex d0d7ea3a3c..c1898f8f12 100644--- a/server/src/services/storage-template.service.spec.ts+++ b/server/src/services/storage-template.service.spec.ts@@ -84,6 +84,7 @@ describe(StorageTemplateService.name, () => {'{{y}}/{{y}}-{{MM}}/{{assetId}}','{{y}}/{{y}}-{{WW}}/{{assetId}}','{{album}}/{{filename}}',+ '{{make}}/{{model}}/{{lensModel}}/{{filename}}',],secondOptions: ['s', 'ss', 'SSS'],weekOptions: ['W', 'WW'],diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.tsindex 864207bf05..bbf5a8a6bf 100644--- a/server/src/services/storage-template.service.ts+++ b/server/src/services/storage-template.service.ts@@ -53,6 +53,7 @@ const storagePresets = ['{{y}}/{{y}}-{{MM}}/{{assetId}}','{{y}}/{{y}}-{{WW}}/{{assetId}}','{{album}}/{{filename}}',+ '{{make}}/{{model}}/{{lensModel}}/{{filename}}',];export interface MoveAssetMetadata {@@ -67,6 +68,9 @@ interface RenderMetadata {albumName: string | null;albumStartDate: Date | null;albumEndDate: Date | null;+ make: string | null;+ model: string | null;+ lensModel: string | null;}@Injectable()@@ -115,6 +119,9 @@ export class StorageTemplateService extends BaseService {albumName: 'album',albumStartDate: new Date(),albumEndDate: new Date(),+ make: 'FUJIFILM',+ model: 'X-T50',+ lensModel: 'XF27mm F2.8 R WR',});} catch (error) {this.logger.warn(`Storage template validation failed: ${JSON.stringify(error)}`);@@ -301,6 +308,9 @@ export class StorageTemplateService extends BaseService {albumName,albumStartDate,albumEndDate,+ make: asset.make,+ model: asset.model,+ lensModel: asset.lensModel,});const fullPath = path.normalize(path.join(rootPath, storagePath));let destination = `${fullPath}.${extension}`;@@ -365,7 +375,7 @@ export class StorageTemplateService extends BaseService {}private render(template: HandlebarsTemplateDelegate<any>, options: RenderMetadata) {- const { filename, extension, asset, albumName, albumStartDate, albumEndDate } = options;+ const { filename, extension, asset, albumName, albumStartDate, albumEndDate, make, model, lensModel } = options;const substitutions: Record<string, string> = {filename,ext: extension,@@ -375,6 +385,9 @@ export class StorageTemplateService extends BaseService {assetIdShort: asset.id.slice(-12),//just throw into the root if it doesn't belong to an albumalbum: (albumName && sanitize(albumName.replaceAll(/\.+/g, ''))) || '',+ make: make ?? '',+ model: model ?? '',+ lensModel: lensModel ?? '',};const systemTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;diff --git a/server/src/types.ts b/server/src/types.tsindex e404332fac..779de1ee37 100644--- a/server/src/types.ts+++ b/server/src/types.ts@@ -472,6 +472,9 @@ export type StorageAsset = {originalFileName: string;fileSizeInByte: number | null;files: AssetFile[];+ make: string | null;+ model: string | null;+ lensModel: string | null;};export type OnThisDayData = { year: number };diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.tsindex f5935d5d0e..6e4193c110 100644--- a/server/test/fixtures/asset.stub.ts+++ b/server/test/fixtures/asset.stub.ts@@ -65,6 +65,9 @@ export const assetStub = {originalFileName: 'IMG_123.jpg',fileSizeInByte: 12_345,files: [],+ make: 'FUJIFILM',+ model: 'X-T50',+ lensModel: 'XF27mm F2.8 R WR',...asset,}),noResizePath: Object.freeze({diff --git a/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte b/web/src/lib/components/admin-settings/StorageTemplateSettings.svelteindex e119e8d8b0..e8514358ee 100644--- a/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte+++ b/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte@@ -60,6 +60,9 @@assetId: 'a8312960-e277-447d-b4ea-56717ccba856',assetIdShort: '56717ccba856',album: $t('album_name'),+ make: 'FUJIFILM',+ model: 'X-T50',+ lensModel: 'XF27mm F2.8 R WR',};const dt = luxon.DateTime.fromISO(new Date('2022-02-03T04:56:05.250').toISOString());diff --git a/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte b/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelteindex 74a05b553f..4274ac70bc 100644--- a/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte+++ b/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte@@ -24,10 +24,8 @@</ul></div><div>- <p class="uppercase font-medium text-primary">{$t('other')}</p>+ <p class="uppercase font-medium text-primary">{$t('album')}</p><ul>- <li>{`{{assetId}}`} - Asset ID</li>- <li>{`{{assetIdShort}}`} - Asset ID (last 12 characters)</li><li>{`{{album}}`} - Album Name</li><li>{`{{album-startDate-x}}`} - Album Start Date and Time (e.g. album-startDate-yy).@@ -39,5 +37,20 @@</li></ul></div>+ <div>+ <p class="uppercase font-medium text-primary">{$t('camera')}</p>+ <ul>+ <li>{`{{make}}`} - FUJIFILM</li>+ <li>{`{{model}}`} - X-T50</li>+ <li>{`{{lensModel}}`} - XF27mm F2.8 R WR</li>+ </ul>+ </div>+ <div>+ <p class="uppercase font-medium text-primary">{$t('other')}</p>+ <ul>+ <li>{`{{assetId}}`} - Asset ID</li>+ <li>{`{{assetIdShort}}`} - Asset ID (last 12 characters)</li>+ </ul>+ </div></div></div>