High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): handle numeric 'Image Description' and 'Description' values (#11636)
Johannes Groß28ba22e8c127
diff --git a/server/src/interfaces/metadata.interface.ts b/server/src/interfaces/metadata.interface.tsindex daba4184e3..386f69a9e7 100644--- a/server/src/interfaces/metadata.interface.ts+++ b/server/src/interfaces/metadata.interface.ts@@ -7,7 +7,7 @@ export interface ExifDuration {Scale?: number;}-export interface ImmichTags extends Omit<Tags, 'FocalLength' | 'Duration'> {+export interface ImmichTags extends Omit<Tags, 'FocalLength' | 'Duration' | 'Description' | 'ImageDescription'> {ContentIdentifier?: string;MotionPhoto?: number;MotionPhotoVersion?: number;@@ -19,6 +19,10 @@ export interface ImmichTags extends Omit<Tags, 'FocalLength' | 'Duration'> {EmbeddedVideoType?: string;EmbeddedVideoFile?: BinaryField;MotionPhotoVideo?: BinaryField;++ // Type is wrong, can also be number.+ Description?: string | number;+ ImageDescription?: string | number;}export interface IMetadataRepository {diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.tsindex e9d09e33aa..d1806a1f4c 100644--- a/server/src/services/metadata.service.spec.ts+++ b/server/src/services/metadata.service.spec.ts@@ -753,6 +753,18 @@ describe(MetadataService.name, () => {}),);});++ it('handles a numeric description', async () => {+ assetMock.getByIds.mockResolvedValue([assetStub.image]);+ metadataMock.readTags.mockResolvedValue({ Description: 1000 });++ await sut.handleMetadataExtraction({ id: assetStub.image.id });+ expect(assetMock.upsertExif).toHaveBeenCalledWith(+ expect.objectContaining({+ description: '1000',+ }),+ );+ });});describe('handleQueueSidecar', () => {diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.tsindex aa29d47131..126a49ee6c 100644--- a/server/src/services/metadata.service.ts+++ b/server/src/services/metadata.service.ts@@ -482,7 +482,7 @@ export class MetadataService implements OnEvents {bitsPerSample: this.getBitsPerSample(tags),colorspace: tags.ColorSpace ?? null,dateTimeOriginal: this.getDateTimeOriginal(tags) ?? asset.fileCreatedAt,- description: (tags.ImageDescription || tags.Description || '').trim(),+ description: String(tags.ImageDescription || tags.Description || '').trim(),exifImageHeight: validate(tags.ImageHeight),exifImageWidth: validate(tags.ImageWidth),exposureTime: tags.ExposureTime ?? null,