KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(server): remove unused filename (#2517)

Browse Source
This commit is contained in:
Jason Rasmussen
2023-05-22 11:26:56 -04:00
committed by GitHub
parent 74353193f8
commit eefe5266a8
9 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/apps/immich/src/api-v1/asset/asset.core.ts
View File

@@ -41,7 +41,7 @@ export class AssetCore {
faces: [],
});
await this.jobRepository.queue({ name: JobName.ASSET_UPLOADED, data: { asset, fileName: file.originalName } });
await this.jobRepository.queue({ name: JobName.ASSET_UPLOADED, data: { asset } });
return asset;
}

14
server/apps/immich/src/api-v1/asset/asset.service.spec.ts
View File

@@ -328,18 +328,8 @@ describe('AssetService', () => {
});
expect(jobMock.queue.mock.calls).toEqual([
[
{
name: JobName.ASSET_UPLOADED,
data: { asset: assetEntityStub.livePhotoMotionAsset, fileName: 'asset_1.mp4' },
},
],
[
{
name: JobName.ASSET_UPLOADED,
data: { asset: assetEntityStub.livePhotoStillAsset, fileName: 'asset_1.jpeg' },
},
],
[{ name: JobName.ASSET_UPLOADED, data: { asset: assetEntityStub.livePhotoMotionAsset } }],
[{ name: JobName.ASSET_UPLOADED, data: { asset: assetEntityStub.livePhotoStillAsset } }],
]);
});
});

3
server/apps/microservices/src/processors.ts
View File

@@ -3,7 +3,6 @@ import {
FacialRecognitionService,
IAssetFaceJob,
IAssetJob,
IAssetUploadedJob,
IBaseJob,
IBulkEntityJob,
IDeleteFilesJob,
@@ -34,7 +33,7 @@ export class BackgroundTaskProcessor {
) {}
@Process(JobName.ASSET_UPLOADED)
async onAssetUpload(job: Job<IAssetUploadedJob>) {
async onAssetUpload(job: Job<IAssetJob>) {
await this.assetService.handleAssetUpload(job.data);
}

9
server/apps/microservices/src/processors/metadata-extraction.processor.ts
View File

@@ -1,7 +1,7 @@
import {
AssetCore,
IAssetJob,
IAssetRepository,
IAssetUploadedJob,
IBaseJob,
IGeocodingRepository,
IJobRepository,
@@ -79,9 +79,8 @@ export class MetadataExtractionProcessor {
: await this.assetRepository.getWithout(WithoutProperty.EXIF);
for (const asset of assets) {
const fileName = asset.originalFileName;
const name = asset.type === AssetType.VIDEO ? JobName.EXTRACT_VIDEO_METADATA : JobName.EXIF_EXTRACTION;
await this.jobRepository.queue({ name, data: { asset, fileName } });
await this.jobRepository.queue({ name, data: { asset } });
}
} catch (error: any) {
this.logger.error(`Unable to queue metadata extraction`, error?.stack);
@@ -89,7 +88,7 @@ export class MetadataExtractionProcessor {
}
@Process(JobName.EXIF_EXTRACTION)
async extractExifInfo(job: Job<IAssetUploadedJob>) {
async extractExifInfo(job: Job<IAssetJob>) {
let asset = job.data.asset;
try {
@@ -194,7 +193,7 @@ export class MetadataExtractionProcessor {
}
@Process({ name: JobName.EXTRACT_VIDEO_METADATA, concurrency: 2 })
async extractVideoMetadata(job: Job<IAssetUploadedJob>) {
async extractVideoMetadata(job: Job<IAssetJob>) {
let asset = job.data.asset;
if (!asset.isVisible) {