High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): exif description whitespace handling (#11249)
Michel Heusschen8b773a2b2e8b
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.tsindex 8731fcf9e6..9b0aed3546 100644--- a/server/src/services/metadata.service.spec.ts+++ b/server/src/services/metadata.service.spec.ts@@ -710,6 +710,26 @@ describe(MetadataService.name, () => {}),);});++ it('trims whitespace from description', async () => {+ assetMock.getByIds.mockResolvedValue([assetStub.image]);+ metadataMock.readTags.mockResolvedValue({ Description: '\t \v \f \n \r' });++ await sut.handleMetadataExtraction({ id: assetStub.image.id });+ expect(assetMock.upsertExif).toHaveBeenCalledWith(+ expect.objectContaining({+ description: '',+ }),+ );++ metadataMock.readTags.mockResolvedValue({ ImageDescription: ' my\n description' });+ await sut.handleMetadataExtraction({ id: assetStub.image.id });+ expect(assetMock.upsertExif).toHaveBeenCalledWith(+ expect.objectContaining({+ description: 'my\n description',+ }),+ );+ });});describe('handleQueueSidecar', () => {@@ -889,6 +909,7 @@ describe(MetadataService.name, () => {}),).resolves.toBe(JobStatus.SUCCESS);expect(metadataMock.writeTags).toHaveBeenCalledWith(assetStub.sidecar.sidecarPath, {+ Description: description,ImageDescription: description,CreationDate: date,GPSLatitude: gps,diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.tsindex de0ab4bb3e..bb6018459a 100644--- a/server/src/services/metadata.service.ts+++ b/server/src/services/metadata.service.ts@@ -314,6 +314,7 @@ export class MetadataService implements OnEvents {const sidecarPath = asset.sidecarPath || `${asset.originalPath}.xmp`;const exif = _.omitBy<Tags>({+ Description: description,ImageDescription: description,CreationDate: dateTimeOriginal,GPSLatitude: latitude,@@ -512,7 +513,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) ?? '',+ description: (tags.ImageDescription || tags.Description || '').trim(),exifImageHeight: validate(tags.ImageHeight),exifImageWidth: validate(tags.ImageWidth),exposureTime: tags.ExposureTime ?? null,