High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): queue android motion assets for transcoding (#17781)
Mert92ac1193e62e
diff --git a/server/src/services/job.service.spec.ts b/server/src/services/job.service.spec.tsindex baac0af428..9acc81ceb7 100644--- a/server/src/services/job.service.spec.ts+++ b/server/src/services/job.service.spec.ts@@ -230,7 +230,7 @@ describe(JobService.name, () => {expect(mocks.logger.error).not.toHaveBeenCalled();});- const tests: Array<{ item: JobItem; jobs: JobName[] }> = [+ const tests: Array<{ item: JobItem; jobs: JobName[]; stub?: any }> = [{item: { name: JobName.SIDECAR_SYNC, data: { id: 'asset-1' } },jobs: [JobName.METADATA_EXTRACTION],@@ -258,14 +258,22 @@ describe(JobService.name, () => {{item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } },jobs: [],+ stub: [assetStub.image],+ },+ {+ item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } },+ jobs: [],+ stub: [assetStub.video],},{item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1', source: 'upload' } },- jobs: [JobName.SMART_SEARCH, JobName.FACE_DETECTION, JobName.VIDEO_CONVERSION],+ jobs: [JobName.SMART_SEARCH, JobName.FACE_DETECTION],+ stub: [assetStub.livePhotoStillAsset],},{- item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-live-image', source: 'upload' } },+ item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1', source: 'upload' } },jobs: [JobName.SMART_SEARCH, JobName.FACE_DETECTION, JobName.VIDEO_CONVERSION],+ stub: [assetStub.video],},{item: { name: JobName.SMART_SEARCH, data: { id: 'asset-1' } },@@ -281,14 +289,10 @@ describe(JobService.name, () => {},];- for (const { item, jobs } of tests) {+ for (const { item, jobs, stub } of tests) {it(`should queue ${jobs.length} jobs when a ${item.name} job finishes successfully`, async () => {- if (item.name === JobName.GENERATE_THUMBNAILS && item.data.source === 'upload') {- if (item.data.id === 'asset-live-image') {- mocks.asset.getByIdsWithAllRelationsButStacks.mockResolvedValue([assetStub.livePhotoStillAsset as any]);- } else {- mocks.asset.getByIdsWithAllRelationsButStacks.mockResolvedValue([assetStub.livePhotoMotionAsset as any]);- }+ if (stub) {+ mocks.asset.getByIdsWithAllRelationsButStacks.mockResolvedValue(stub);}mocks.job.run.mockResolvedValue(JobStatus.SUCCESS);diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.tsindex edd018d7b1..f8298336a8 100644--- a/server/src/services/job.service.ts+++ b/server/src/services/job.service.ts@@ -297,8 +297,6 @@ export class JobService extends BaseService {if (asset.type === AssetType.VIDEO) {jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });- } else if (asset.livePhotoVideoId) {- jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.livePhotoVideoId } });}await this.jobRepository.queueAll(jobs);diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.tsindex e412b1c31f..4fbb2cc48c 100644--- a/server/src/services/metadata.service.spec.ts+++ b/server/src/services/metadata.service.spec.ts@@ -598,6 +598,10 @@ describe(MetadataService.name, () => {livePhotoVideoId: fileStub.livePhotoMotion.uuid,});expect(mocks.asset.update).toHaveBeenCalledTimes(3);+ expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({+ name: JobName.VIDEO_CONVERSION,+ data: { id: assetStub.livePhotoMotionAsset.id },+ });});it('should extract the EmbeddedVideo tag from Samsung JPEG motion photos', async () => {@@ -652,6 +656,10 @@ describe(MetadataService.name, () => {livePhotoVideoId: fileStub.livePhotoMotion.uuid,});expect(mocks.asset.update).toHaveBeenCalledTimes(3);+ expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({+ name: JobName.VIDEO_CONVERSION,+ data: { id: assetStub.livePhotoMotionAsset.id },+ });});it('should extract the motion photo video from the XMP directory entry ', async () => {@@ -706,6 +714,10 @@ describe(MetadataService.name, () => {livePhotoVideoId: fileStub.livePhotoMotion.uuid,});expect(mocks.asset.update).toHaveBeenCalledTimes(3);+ expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({+ name: JobName.VIDEO_CONVERSION,+ data: { id: assetStub.livePhotoMotionAsset.id },+ });});it('should delete old motion photo video assets if they do not match what is extracted', async () => {diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.tsindex faf146a2be..71b8e2de47 100644--- a/server/src/services/metadata.service.ts+++ b/server/src/services/metadata.service.ts@@ -576,6 +576,7 @@ export class MetadataService extends BaseService {this.logger.log(`Wrote motion photo video to ${motionAsset.originalPath}`);await this.handleMetadataExtraction({ id: motionAsset.id });+ await this.jobRepository.queue({ name: JobName.VIDEO_CONVERSION, data: { id: motionAsset.id } });}this.logger.debug(`Finished motion photo video extraction for asset ${asset.id}: ${asset.originalPath}`);