X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=bd81aa3bad774d134df064c70c899cafd4a7b9f6;hb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;hp=e43ea3f1dad03c62cf65457e40fe461b22c98227;hpb=88108880bbdba473cfe36ecbebc1c3c4f972e102;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index e43ea3f1d..bd81aa3ba 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -4,18 +4,19 @@ import { readFile, remove } from 'fs-extra' import { logger } from './logger' 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) { + if (path === destination) { throw new Error('Sharp 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 buf = await readFile(path) const sharpInstance = sharp(buf) await remove(destination) @@ -24,7 +25,7 @@ async function processImage ( .resize(newSize.width, newSize.height) .toFile(destination) - await remove(physicalFile.path) + if (keepOriginal !== true) await remove(path) } // ---------------------------------------------------------------------------