c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-04 02:46:47 +01:00
Code Releases Activity

fix(server): await thumbnail generation before returning (#3975)

Browse source 
* await sharp command, minor fixes

* removed outdated test
This commit is contained in:
Mert 2023-09-04 19:24:55 -04:00 committed by GitHub
parent 90f9501902
commit 04d4a30471
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/domain/media/media.service.spec.ts
View file

@ -200,12 +200,6 @@ describe(MediaService.name, () => {
expect(assetMock.save).not.toHaveBeenCalledWith(); expect(assetMock.save).not.toHaveBeenCalledWith();
}); });
it('should skip thumbnail generate if resize path is missing', async () => {
assetMock.getByIds.mockResolvedValue([assetStub.noResizePath]);
await sut.handleGenerateWebpThumbnail({ id: assetStub.noResizePath.id });
expect(mediaMock.resize).not.toHaveBeenCalled();
});
it('should generate a thumbnail', async () => { it('should generate a thumbnail', async () => {
assetMock.getByIds.mockResolvedValue([assetStub.image]); assetMock.getByIds.mockResolvedValue([assetStub.image]);
await sut.handleGenerateWebpThumbnail({ id: assetStub.image.id }); await sut.handleGenerateWebpThumbnail({ id: assetStub.image.id });

2
server/src/domain/media/media.service.ts
View file

@ -109,7 +109,7 @@ export class MediaService {
async handleGenerateWebpThumbnail({ id }: IEntityJob) { async handleGenerateWebpThumbnail({ id }: IEntityJob) {
const [asset] = await this.assetRepository.getByIds([id]); const [asset] = await this.assetRepository.getByIds([id]);
if (!asset || !asset.resizePath) { if (!asset) {
return false; return false;
} }

3
server/src/infra/repositories/media.repository.ts
View file

@ -15,6 +15,7 @@ export class MediaRepository implements IMediaRepository {
crop(input: string | Buffer, options: CropOptions): Promise<Buffer> { crop(input: string | Buffer, options: CropOptions): Promise<Buffer> {
return sharp(input, { failOn: 'none' }) return sharp(input, { failOn: 'none' })
.pipelineColorspace('rgb16')
.extract({ .extract({
left: options.left, left: options.left,
top: options.top, top: options.top,
@ -38,7 +39,7 @@ export class MediaRepository implements IMediaRepository {
} }
} }
const chromaSubsampling = options.quality >= 80 ? '4:4:4' : '4:2:0'; // this is default in libvips (except the threshold is 90), but we need to set it manually in sharp const chromaSubsampling = options.quality >= 80 ? '4:4:4' : '4:2:0'; // this is default in libvips (except the threshold is 90), but we need to set it manually in sharp
sharp(input, { failOn: 'none' }) await sharp(input, { failOn: 'none' })
.pipelineColorspace('rgb16') .pipelineColorspace('rgb16')
.resize(options.size, options.size, { fit: 'outside', withoutEnlargement: true }) .resize(options.size, options.size, { fit: 'outside', withoutEnlargement: true })
.rotate() .rotate()