X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fhelpers%2Fimage-utils.ts;h=bbd4692ef31b47919647c9ef15c2e99f4a46d569;hb=bd09dfaf8dcb0ca4cd5dac9f13e3117486f3bcce;hp=ebb102a0dec1960e3a58638e9e3d7ee0d53f3620;hpb=0164fc112a98897849a8eda2f0b5d208e813e014;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index ebb102a0d..bbd4692ef 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -12,12 +12,14 @@ function generateImageFilename (extension = '.jpg') { return buildUUID() + extension } -async function processImage ( - path: string, - destination: string, - newSize: { width: number, height: number }, - keepOriginal = false -) { +async function processImage (options: { + path: string + destination: string + newSize: { width: number, height: number } + keepOriginal?: boolean // default false +}) { + const { path, destination, newSize, keepOriginal = false } = options + const extension = getLowercaseExtension(path) if (path === destination) { @@ -36,7 +38,14 @@ async function processImage ( if (keepOriginal !== true) await remove(path) } -async function generateImageFromVideoFile (fromPath: string, folder: string, imageName: string, size: { width: number, height: number }) { +async function generateImageFromVideoFile (options: { + fromPath: string + folder: string + imageName: string + size: { width: number, height: number } +}) { + const { fromPath, folder, imageName, size } = options + const pendingImageName = 'pending-' + imageName const pendingImagePath = join(folder, pendingImageName) @@ -44,7 +53,7 @@ async function generateImageFromVideoFile (fromPath: string, folder: string, ima await generateThumbnailFromVideo(fromPath, folder, imageName) const destination = join(folder, imageName) - await processImage(pendingImagePath, destination, size) + await processImage({ path: pendingImagePath, destination, newSize: size }) } catch (err) { logger.error('Cannot generate image from video %s.', fromPath, { err, ...lTags() })