do e2e instead

immich-app · Feb 5, 2025 · 88b50f3 · 88b50f3
1 parent e8c4d27
commit 88b50f3
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 36 deletions.
diff --git a/e2e/src/api/specs/jobs.e2e-spec.ts b/e2e/src/api/specs/jobs.e2e-spec.ts
@@ -1,5 +1,5 @@
 import { JobCommand, JobName, LoginResponseDto, updateConfig } from '@immich/sdk';
-import { cpSync } from 'node:fs';
+import { cpSync, rmSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
 import { basename } from 'node:path';
 import { errorDto } from 'src/responses';
@@ -32,6 +32,16 @@ describe('/jobs', () => {
         force: false,
       });
 
+      await utils.jobCommand(admin.accessToken, JobName.SmartSearch, {
+        command: JobCommand.Resume,
+        force: false,
+      });
+
+      await utils.jobCommand(admin.accessToken, JobName.DuplicateDetection, {
+        command: JobCommand.Resume,
+        force: false,
+      });
+
       const config = await utils.getSystemConfig(admin.accessToken);
       config.machineLearning.duplicateDetection.enabled = false;
       config.machineLearning.enabled = false;
@@ -47,22 +57,15 @@ describe('/jobs', () => {
     });
 
     it('should queue metadata extraction for missing assets', async () => {
-      const path1 = `${testAssetDir}/formats/raw/Nikon/D700/philadelphia.nef`;
-      const path2 = `${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`;
-
-      await utils.createAsset(admin.accessToken, {
-        assetData: { bytes: await readFile(path1), filename: basename(path1) },
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+      const path = `${testAssetDir}/formats/raw/Nikon/D700/philadelphia.nef`;
 
       await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
         command: JobCommand.Pause,
         force: false,
       });
 
       const { id } = await utils.createAsset(admin.accessToken, {
-        assetData: { bytes: await readFile(path2), filename: basename(path2) },
+        assetData: { bytes: await readFile(path), filename: basename(path) },
       });
 
       await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
@@ -101,36 +104,62 @@ describe('/jobs', () => {
       }
     });
 
-    it('should queue thumbnail extraction for missing assets', async () => {
-      const path1 = `${testAssetDir}/formats/raw/Nikon/D700/philadelphia.nef`;
-      const path2 = `${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`;
+    it('should not re-extract metadata for existing assets', async () => {
+      const path = `${testAssetDir}/temp/metadata/asset.jpg`;
 
-      await utils.createAsset(admin.accessToken, {
-        assetData: { bytes: await readFile(path1), filename: basename(path1) },
+      cpSync(`${testAssetDir}/formats/raw/Nikon/D700/philadelphia.nef`, path);
+
+      const { id } = await utils.createAsset(admin.accessToken, {
+        assetData: { bytes: await readFile(path), filename: basename(path) },
       });
 
-      await utils.waitForQueueFinish(admin.accessToken, JobName.MetadataExtraction);
-      await utils.waitForQueueFinish(admin.accessToken, JobName.ThumbnailGeneration);
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      {
+        const asset = await utils.getAssetInfo(admin.accessToken, id);
+
+        expect(asset.exifInfo).toBeDefined();
+        expect(asset.exifInfo?.model).toBe('NIKON D700');
+      }
+
+      cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, path);
+
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Start,
+        force: false,
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      {
+        const asset = await utils.getAssetInfo(admin.accessToken, id);
+
+        expect(asset.exifInfo).toBeDefined();
+        expect(asset.exifInfo?.model).toBe('NIKON D700');
+      }
+
+      rmSync(path);
+    });
+
+    it('should queue thumbnail extraction for assets missing thumbs', async () => {
+      const path = `${testAssetDir}/albums/nature/tanners_ridge.jpg`;
 
       await utils.jobCommand(admin.accessToken, JobName.ThumbnailGeneration, {
         command: JobCommand.Pause,
         force: false,
       });
 
       const { id } = await utils.createAsset(admin.accessToken, {
-        assetData: { bytes: await readFile(path2), filename: basename(path2) },
+        assetData: { bytes: await readFile(path), filename: basename(path) },
       });
 
       await utils.waitForQueueFinish(admin.accessToken, JobName.MetadataExtraction);
       await utils.waitForQueueFinish(admin.accessToken, JobName.ThumbnailGeneration);
 
-      {
-        const asset = await utils.getAssetInfo(admin.accessToken, id);
+      const assetBefore = await utils.getAssetInfo(admin.accessToken, id);
+      expect(assetBefore.thumbhash).toBeNull();
 
-        expect(asset.thumbhash).toBeNull();
-      }
-
-      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+      await utils.jobCommand(admin.accessToken, JobName.ThumbnailGeneration, {
         command: JobCommand.Empty,
         force: false,
       });
@@ -151,11 +180,46 @@ describe('/jobs', () => {
       await utils.waitForQueueFinish(admin.accessToken, JobName.MetadataExtraction);
       await utils.waitForQueueFinish(admin.accessToken, JobName.ThumbnailGeneration);
 
-      {
-        const asset = await utils.getAssetInfo(admin.accessToken, id);
+      const assetAfter = await utils.getAssetInfo(admin.accessToken, id);
+      expect(assetAfter.thumbhash).not.toBeNull();
+    });
 
-        expect(asset.thumbhash).not.toBeNull();
-      }
+    it('should not reload existing thumbnail when running thumb job for missing assets', async () => {
+      const path = `${testAssetDir}/temp/thumbs/asset1.jpg`;
+
+      cpSync(`${testAssetDir}/albums/nature/tanners_ridge.jpg`, path);
+
+      const { id } = await utils.createAsset(admin.accessToken, {
+        assetData: { bytes: await readFile(path), filename: basename(path) },
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, JobName.MetadataExtraction);
+      await utils.waitForQueueFinish(admin.accessToken, JobName.ThumbnailGeneration);
+
+      const assetBefore = await utils.getAssetInfo(admin.accessToken, id);
+
+      cpSync(`${testAssetDir}/albums/nature/notocactus_minimus.jpg`, path);
+
+      await utils.jobCommand(admin.accessToken, JobName.ThumbnailGeneration, {
+        command: JobCommand.Resume,
+        force: false,
+      });
+
+      // This runs the missing thumbnail job
+      await utils.jobCommand(admin.accessToken, JobName.ThumbnailGeneration, {
+        command: JobCommand.Start,
+        force: false,
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, JobName.MetadataExtraction);
+      await utils.waitForQueueFinish(admin.accessToken, JobName.ThumbnailGeneration);
+
+      const assetAfter = await utils.getAssetInfo(admin.accessToken, id);
+
+      // Asset 1 thumbnail should be untouched since its thumb should not have been reloaded, even though the file was changed
+      expect(assetAfter.thumbhash).toEqual(assetBefore.thumbhash);
+
+      rmSync(path);
     });
 
     it('should queue duplicate detection for missing duplicates', async () => {
@@ -235,6 +299,9 @@ describe('/jobs', () => {
 
         expect(asset1.duplicateId).toEqual(asset2.duplicateId);
       }
+
+      rmSync(`${testAssetDir}/temp/dupes/asset1.jpg`);
+      rmSync(`${testAssetDir}/temp/dupes/asset2.jpg`);
     }, 120_000);
 
     it('should queue smart search for missing assets', async () => {

diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
@@ -454,8 +454,8 @@ export class AssetRepository implements IAssetRepository {
       .selectAll('assets')
       .$if(property === WithoutProperty.DUPLICATE, (qb) =>
         qb
-          .leftJoin('asset_job_status as job_status', 'assets.id', 'job_status.assetId')
-          .where((eb) => eb.or([eb('job_status.duplicatesDetectedAt', 'is', null), eb('assetId', 'is', null)]))
+          .innerJoin('asset_job_status as job_status', 'assets.id', 'job_status.assetId')
+          .where('job_status.duplicatesDetectedAt', 'is', null)
           .where('job_status.previewAt', 'is not', null)
           .where((eb) => eb.exists(eb.selectFrom('smart_search').where('assetId', '=', eb.ref('assets.id'))))
           .where('assets.isVisible', '=', true),
@@ -473,8 +473,8 @@ export class AssetRepository implements IAssetRepository {
       )
       .$if(property === WithoutProperty.FACES, (qb) =>
         qb
-          .leftJoin('asset_job_status as job_status', 'assetId', 'assets.id')
-          .where((eb) => eb.or([eb('job_status.facesRecognizedAt', 'is', null), eb('assetId', 'is', null)]))
+          .innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
+          .where('job_status.facesRecognizedAt', 'is', null)
           .where('job_status.previewAt', 'is not', null)
           .where('assets.isVisible', '=', true),
       )
@@ -485,20 +485,19 @@ export class AssetRepository implements IAssetRepository {
       )
       .$if(property === WithoutProperty.SMART_SEARCH, (qb) =>
         qb
-          .leftJoin('asset_job_status as job_status', 'assetId', 'assets.id')
-          .where((eb) => eb.or([eb('job_status.previewAt', 'is not', null), eb('assetId', 'is', null)]))
+          .innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
+          .where('job_status.previewAt', 'is not', null)
           .where('assets.isVisible', '=', true)
           .where((eb) =>
             eb.not((eb) => eb.exists(eb.selectFrom('smart_search').whereRef('assetId', '=', 'assets.id'))),
           ),
       )
       .$if(property === WithoutProperty.THUMBNAIL, (qb) =>
         qb
-          .leftJoin('asset_job_status as job_status', 'assetId', 'assets.id')
+          .innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
           .where('assets.isVisible', '=', true)
           .where((eb) =>
             eb.or([
-              eb('assetId', 'is', null),
               eb('job_status.previewAt', 'is', null),
               eb('job_status.thumbnailAt', 'is', null),
               eb('assets.thumbhash', 'is', null),