X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=b1c7d3d476c549c395dbb8ff8207fc469f21d52b;hb=c24aac6bc73033195c37d81cf2b7449c9b54712c;hp=e43ea3f1dad03c62cf65457e40fe461b22c98227;hpb=2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index e43ea3f1d..b1c7d3d47 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -1,30 +1,32 @@ import 'multer' -import * as sharp from 'sharp' import { readFile, remove } from 'fs-extra' import { logger } from './logger' +const Jimp = require('jimp') async function processImage ( - physicalFile: { path: string }, + path: string, destination: string, - newSize: { width: number, height: number } + newSize: { width: number, height: number }, + keepOriginal = false ) { - if (physicalFile.path === destination) { - throw new Error('Sharp needs an input path different that the output path.') + if (path === destination) { + throw new Error('Jimp needs an input path different that the output path.') } - logger.debug('Processing image %s to %s.', physicalFile.path, destination) + logger.debug('Processing image %s to %s.', path, destination) // Avoid sharp cache - const buf = await readFile(physicalFile.path) - const sharpInstance = sharp(buf) + const buf = await readFile(path) + const jimpInstance = await Jimp.read(buf) await remove(destination) - await sharpInstance + await jimpInstance .resize(newSize.width, newSize.height) - .toFile(destination) + .quality(80) + .writeAsync(destination) - await remove(physicalFile.path) + if (keepOriginal !== true) await remove(path) } // ---------------------------------------------------------------------------