fix(server): adjust panorama medata for new image dimensions

Author: meesfrensel

server/src/repositories/media.repository.ts

@@ -121,19 +121,30 @@ export class MediaRepository {
     }
   }
 
-  async copyTagGroup(tagGroup: string, source: string, target: string): Promise<boolean> {
+  async copyGPanoTags(source: string, target: string, ratio: number = 1): Promise<boolean> {
+    const tagsToWrite: Record<string, any> = {};
     try {
-      await exiftool.write(
-        target,
-        {},
-        {
-          ignoreMinorErrors: true,
-          writeArgs: ['-TagsFromFile', source, `-${tagGroup}:all>${tagGroup}:all`, '-overwrite_original'],
-        },
-      );
+      const metadata = await exiftool.readRaw(source, ['-XMP-GPano:all', '-G1', '-s']);
+
+      for (const [tag, val] of Object.entries(metadata)) {
+        if (tag.startsWith('XMP-GPano:')) {
+          tagsToWrite[tag] =
+            tag.endsWith('Pixels') && typeof val === 'number' ? Math.round(val * ratio) : (tagsToWrite[tag] = val);
+        }
+      }
+    } catch (error: any) {
+      this.logger.warn(`Could not read or parse GPano tag data from image: ${error.message}`);
+      return false;
+    }
+
+    try {
+      await exiftool.write(target, tagsToWrite, {
+        ignoreMinorErrors: true,
+        writeArgs: ['-overwrite_original'],
+      });
       return true;
     } catch (error: any) {
-      this.logger.warn(`Could not copy tag data to image: ${error.message}`);
+      this.logger.warn(`Could not write GPano tag data to image: ${error.message}`);
       return false;
     }
   }

server/src/services/media.service.spec.ts

@@ -865,7 +865,6 @@ 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);
 
@@ -892,11 +891,11 @@ describe(MediaService.name, () => {
         expect.any(String),
       );
 
-      expect(mocks.media.copyTagGroup).toHaveBeenCalledTimes(2);
-      expect(mocks.media.copyTagGroup).toHaveBeenCalledWith(
-        'XMP-GPano',
+      expect(mocks.media.copyGPanoTags).toHaveBeenCalledTimes(2);
+      expect(mocks.media.copyGPanoTags).toHaveBeenCalledWith(
         assetStub.panoramaTif.originalPath,
         expect.any(String),
+        1440 / assetStub.panoramaTif.exifInfo.exifImageHeight!,
       );
     });
 

server/src/services/media.service.ts

@@ -316,12 +316,13 @@ export class MediaService extends BaseService {
 
     const outputs = await Promise.all(promises);
 
-    if (asset.exifInfo.projectionType === 'EQUIRECTANGULAR') {
+    const originalSize = asset.exifInfo.exifImageHeight;
+    if (asset.exifInfo.projectionType === 'EQUIRECTANGULAR' && originalSize) {
+      // preview size is min(preview size, original size) so do the same for pano pixel adjustment
+      const pixelRatio = image.preview.size > originalSize ? 1 : image.preview.size / originalSize;
       const promises = [
-        this.mediaRepository.copyTagGroup('XMP-GPano', asset.originalPath, previewPath),
-        fullsizePath
-          ? this.mediaRepository.copyTagGroup('XMP-GPano', asset.originalPath, fullsizePath)
-          : Promise.resolve(),
+        this.mediaRepository.copyGPanoTags(asset.originalPath, previewPath, pixelRatio),
+        fullsizePath ? this.mediaRepository.copyGPanoTags(asset.originalPath, fullsizePath) : Promise.resolve(),
       ];
       await Promise.all(promises);
     }

server/test/fixtures/asset.stub.ts

@@ -897,6 +897,7 @@ export const assetStub = {
     exifInfo: {
       fileSizeInByte: 5000,
       projectionType: 'EQUIRECTANGULAR',
+      exifImageHeight: 2160,
     } as Exif,
     duplicateId: null,
     isOffline: false,

server/test/repositories/media.repository.mock.ts

@@ -6,7 +6,7 @@ export const newMediaRepositoryMock = (): Mocked<RepositoryInterface<MediaReposi
   return {
     generateThumbnail: vitest.fn().mockImplementation(() => Promise.resolve()),
     writeExif: vitest.fn().mockImplementation(() => Promise.resolve()),
-    copyTagGroup: vitest.fn().mockImplementation(() => Promise.resolve()),
+    copyGPanoTags: vitest.fn().mockResolvedValue(true),
     generateThumbhash: vitest.fn().mockResolvedValue(Buffer.from('')),
     decodeImage: vitest.fn().mockResolvedValue({ data: Buffer.from(''), info: {} }),
     extract: vitest.fn().mockResolvedValue(null),