Skip to content

High performance self-hosted photo and video management solution.

fix(server): use preview path for person thumbnails from videos (#18419)

Mert493b9b7a54de
diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts
index 3e77127aa9..3b9eafde8f 100644
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -941,6 +941,48 @@ describe(MediaService.name, () => {
});
});
+ it('should use preview path if video', async () => {
+ mocks.person.getDataForThumbnailGenerationJob.mockResolvedValue(personThumbnailStub.videoThumbnail);
+ mocks.media.generateThumbnail.mockResolvedValue();
+ const data = Buffer.from('');
+ const info = { width: 1000, height: 1000 } as OutputInfo;
+ mocks.media.decodeImage.mockResolvedValue({ data, info });
+
+ await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
+ JobStatus.SUCCESS,
+ );
+
+ expect(mocks.person.getDataForThumbnailGenerationJob).toHaveBeenCalledWith(personStub.primaryPerson.id);
+ expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/admin_id/pe/rs');
+ expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.newThumbnailMiddle.previewPath, {
+ colorspace: Colorspace.P3,
+ orientation: undefined,
+ processInvalidImages: false,
+ });
+ expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
+ data,
+ {
+ colorspace: Colorspace.P3,
+ format: ImageFormat.JPEG,
+ quality: 80,
+ crop: {
+ left: 238,
+ top: 163,
+ width: 274,
+ height: 274,
+ },
+ raw: info,
+ processInvalidImages: false,
+ size: 250,
+ },
+ 'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+ );
+ expect(mocks.person.update).toHaveBeenCalledWith({
+ id: 'person-1',
+ thumbnailPath: 'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+ });
+ });
+
it('should generate a thumbnail without going negative', async () => {
mocks.person.getDataForThumbnailGenerationJob.mockResolvedValue(personThumbnailStub.newThumbnailStart);
mocks.media.generateThumbnail.mockResolvedValue();
diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
index 5cb9d928c3..bd419f0b34 100644
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -328,15 +328,13 @@ export class MediaService extends BaseService {
const { ownerId, x1, y1, x2, y2, oldWidth, oldHeight, exifOrientation, previewPath, originalPath } = data;
let inputImage: string | Buffer;
- if (mimeTypes.isVideo(originalPath)) {
+ if (data.type === AssetType.VIDEO) {
if (!previewPath) {
this.logger.error(`Could not generate person thumbnail for video ${id}: missing preview path`);
return JobStatus.FAILED;
}
inputImage = previewPath;
- }
-
- if (image.extractEmbedded && mimeTypes.isRaw(originalPath)) {
+ } else if (image.extractEmbedded && mimeTypes.isRaw(originalPath)) {
const extracted = await this.extractImage(originalPath, image.preview.size);
inputImage = extracted ? extracted.buffer : originalPath;
} else {
diff --git a/server/test/fixtures/person.stub.ts b/server/test/fixtures/person.stub.ts
index 21a184035a..86f3bcde21 100644
--- a/server/test/fixtures/person.stub.ts
+++ b/server/test/fixtures/person.stub.ts
@@ -246,4 +246,17 @@ export const personThumbnailStub = {
exifOrientation: '1',
previewPath: previewFile.path,
}),
+ videoThumbnail: Object.freeze({
+ ownerId: userStub.admin.id,
+ x1: 100,
+ y1: 100,
+ x2: 200,
+ y2: 200,
+ oldHeight: 500,
+ oldWidth: 400,
+ type: AssetType.VIDEO,
+ originalPath: '/original/path.mp4',
+ exifOrientation: '1',
+ previewPath: previewFile.path,
+ }),
};