High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): copy relevant panorama tags to preview image (#23953)
Mees Frensel271a42ac7fe4
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.tsindex d98e018efb..a8e96709ff 100644--- a/server/src/repositories/media.repository.ts+++ b/server/src/repositories/media.repository.ts@@ -121,6 +121,23 @@ export class MediaRepository {}}+ async copyTagGroup(tagGroup: string, source: string, target: string): Promise<boolean> {+ try {+ await exiftool.write(+ target,+ {},+ {+ ignoreMinorErrors: true,+ writeArgs: ['-TagsFromFile', source, `-${tagGroup}:all>${tagGroup}:all`, '-overwrite_original'],+ },+ );+ return true;+ } catch (error: any) {+ this.logger.warn(`Could not copy tag data to image: ${error.message}`);+ return false;+ }+ }+decodeImage(input: string | Buffer, options: DecodeToBufferOptions) {return this.getImageDecodingPipeline(input, options).raw().toBuffer({ resolveWithObject: true });}diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.tsindex ad52b0e8b0..8617930534 100644--- a/server/src/services/media.service.spec.ts+++ b/server/src/services/media.service.spec.ts@@ -865,6 +865,7 @@ describe(MediaService.name, () => {mocks.systemMetadata.get.mockResolvedValue({ image: { fullsize: { enabled: false } } });mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });+ mocks.media.copyTagGroup.mockResolvedValue(true);mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.panoramaTif);@@ -890,6 +891,13 @@ describe(MediaService.name, () => {},expect.any(String),);++ expect(mocks.media.copyTagGroup).toHaveBeenCalledTimes(2);+ expect(mocks.media.copyTagGroup).toHaveBeenCalledWith(+ 'XMP-GPano',+ assetStub.panoramaTif.originalPath,+ expect.any(String),+ );});it('should respect encoding options when generating full-size preview', async () => {diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.tsindex 6caa682f5e..82f041c111 100644--- a/server/src/services/media.service.ts+++ b/server/src/services/media.service.ts@@ -316,6 +316,16 @@ export class MediaService extends BaseService {const outputs = await Promise.all(promises);+ if (asset.exifInfo.projectionType === 'EQUIRECTANGULAR') {+ const promises = [+ this.mediaRepository.copyTagGroup('XMP-GPano', asset.originalPath, previewPath),+ fullsizePath+ ? this.mediaRepository.copyTagGroup('XMP-GPano', asset.originalPath, fullsizePath)+ : Promise.resolve(),+ ];+ await Promise.all(promises);+ }+return { previewPath, thumbnailPath, fullsizePath, thumbhash: outputs[0] as Buffer };}diff --git a/server/test/repositories/media.repository.mock.ts b/server/test/repositories/media.repository.mock.tsindex c6ab11aaa1..b6b1e82b52 100644--- a/server/test/repositories/media.repository.mock.ts+++ b/server/test/repositories/media.repository.mock.ts@@ -6,6 +6,7 @@ export const newMediaRepositoryMock = (): Mocked<RepositoryInterface<MediaReposireturn {generateThumbnail: vitest.fn().mockImplementation(() => Promise.resolve()),writeExif: vitest.fn().mockImplementation(() => Promise.resolve()),+ copyTagGroup: vitest.fn().mockImplementation(() => Promise.resolve()),generateThumbhash: vitest.fn().mockResolvedValue(Buffer.from('')),decodeImage: vitest.fn().mockResolvedValue({ data: Buffer.from(''), info: {} }),extract: vitest.fn().mockResolvedValue(null),