don't add separate source

immich-app · Dec 19, 2024 · 400e4e0 · 400e4e0
1 parent d0bb59f
commit 400e4e0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/e2e/src/api/specs/library.e2e-spec.ts b/e2e/src/api/specs/library.e2e-spec.ts
@@ -414,6 +414,8 @@ describe('/libraries', () => {
 
       await scan(admin.accessToken, library.id);
       await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
       cpSync(`${testAssetDir}/albums/nature/tanners_ridge.jpg`, `${testAssetDir}/temp/directoryA/assetB.jpg`);
       await utimes(`${testAssetDir}/temp/directoryA/assetB.jpg`, 447_775_200_001);
@@ -425,6 +427,7 @@ describe('/libraries', () => {
       expect(status).toBe(204);
 
       await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
       await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
       utils.removeImageFile(`${testAssetDir}/temp/directoryA/assetB.jpg`);
 
@@ -457,6 +460,7 @@ describe('/libraries', () => {
       expect(status).toBe(204);
 
       await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
       await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
       utils.removeImageFile(`${testAssetDir}/temp/directoryA/assetB.jpg`);
 
@@ -615,6 +619,7 @@ describe('/libraries', () => {
         await scan(admin.accessToken, library.id);
 
         await utils.waitForQueueFinish(admin.accessToken, 'library');
+        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
         await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
@@ -641,6 +646,7 @@ describe('/libraries', () => {
 
         await scan(admin.accessToken, library.id);
         await utils.waitForQueueFinish(admin.accessToken, 'library');
+        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
         await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
@@ -668,6 +674,7 @@ describe('/libraries', () => {
 
         await scan(admin.accessToken, library.id);
         await utils.waitForQueueFinish(admin.accessToken, 'library');
+        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
         await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });

diff --git a/e2e/test-assets b/e2e/test-assets
diff --git a/server/src/interfaces/job.interface.ts b/server/src/interfaces/job.interface.ts
@@ -135,7 +135,7 @@ export interface IDelayedJob extends IBaseJob {
 
 export interface IEntityJob extends IBaseJob {
   id: string;
-  source?: 'upload' | 'library-import' | 'sidecar-write' | 'copy';
+  source?: 'upload' | 'sidecar-write' | 'copy';
   notify?: boolean;
 }
 

diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
@@ -250,7 +250,7 @@ export class JobService extends BaseService {
       }
 
       case JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE: {
-        if (item.data.source === 'upload' || item.data.source === 'copy' || item.data.source === 'library-import') {
+        if (item.data.source === 'upload' || item.data.source === 'copy') {
           await this.jobRepository.queue({ name: JobName.GENERATE_THUMBNAILS, data: item.data });
         }
         break;
@@ -266,7 +266,7 @@ export class JobService extends BaseService {
       }
 
       case JobName.GENERATE_THUMBNAILS: {
-        if (!item.data.notify && item.data.source !== 'upload' && item.data.source === 'library-import') {
+        if (!item.data.notify && item.data.source !== 'upload') {
           break;
         }
 

diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
@@ -422,10 +422,9 @@ describe(LibraryService.name, () => {
       expect(jobMock.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.METADATA_EXTRACTION,
+            name: JobName.SIDECAR_DISCOVERY,
             data: {
               id: assetStub.image.id,
-              source: 'upload',
             },
           },
         ],
@@ -467,10 +466,9 @@ describe(LibraryService.name, () => {
       expect(jobMock.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.METADATA_EXTRACTION,
+            name: JobName.SIDECAR_DISCOVERY,
             data: {
               id: assetStub.image.id,
-              source: 'upload',
             },
           },
         ],

diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
@@ -423,9 +423,10 @@ export class LibraryService extends BaseService {
   async queuePostSyncJobs(asset: AssetEntity) {
     this.logger.debug(`Queueing metadata extraction for: ${asset.originalPath}`);
 
+    // We queue a sidecar discovery which, in turn, queues metadata extraction
     await this.jobRepository.queue({
-      name: JobName.METADATA_EXTRACTION,
-      data: { id: asset.id, source: 'library-import' },
+      name: JobName.SIDECAR_DISCOVERY,
+      data: { id: asset.id },
     });
   }
 

diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
@@ -148,23 +148,17 @@ export class MetadataService extends BaseService {
   }
 
   @OnJob({ name: JobName.METADATA_EXTRACTION, queue: QueueName.METADATA_EXTRACTION })
-  async handleMetadataExtraction({ id, source }: JobOf<JobName.METADATA_EXTRACTION>): Promise<JobStatus> {
+  async handleMetadataExtraction({ id }: JobOf<JobName.METADATA_EXTRACTION>): Promise<JobStatus> {
     this.logger.verbose(`Extracting metadata for asset ${id}`);
 
     const { metadata, reverseGeocoding } = await this.getConfig({ withCache: true });
 
-    if (source === 'library-import') {
-      await this.processSidecar(id, false);
-    }
-
     const [asset] = await this.assetRepository.getByIds([id], { faces: { person: false } });
 
     if (!asset) {
       return JobStatus.FAILED;
     }
 
-    this.logger.verbose(`Sidecar path: ${asset.sidecarPath}`);
-
     const stats = await this.storageRepository.stat(asset.originalPath);
 
     const exifTags = await this.getExifTags(asset);
+ −		formats/raw/Canon/EOS_30D.CR2
+ −		formats/raw/Canon/EOS_70D.CR2
+ −		metadata/xmp/dates/2000.xmp
+ −		metadata/xmp/dates/2010.xmp
+ −		metadata/xmp/dates/2020.xmp