From 0c9668f77901e7540e2c7045eb0f2974a4842a69 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 21 Apr 2023 14:55:10 +0200 Subject: Implement remote runner jobs in server Move ffmpeg functions to @shared --- server/helpers/image-utils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/helpers/image-utils.ts') diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index bbd4692ef..05b258d8a 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -3,7 +3,7 @@ import Jimp, { read as jimpRead } from 'jimp' import { join } from 'path' import { getLowercaseExtension } from '@shared/core-utils' import { buildUUID } from '@shared/extra-utils' -import { convertWebPToJPG, generateThumbnailFromVideo, processGIF } from './ffmpeg/ffmpeg-images' +import { convertWebPToJPG, generateThumbnailFromVideo, processGIF } from './ffmpeg' import { logger, loggerTagsFactory } from './logger' const lTags = loggerTagsFactory('image-utils') @@ -30,7 +30,7 @@ async function processImage (options: { // Use FFmpeg to process GIF if (extension === '.gif') { - await processGIF(path, destination, newSize) + await processGIF({ path, destination, newSize }) } else { await jimpProcessor(path, destination, newSize, extension) } @@ -50,7 +50,7 @@ async function generateImageFromVideoFile (options: { const pendingImagePath = join(folder, pendingImageName) try { - await generateThumbnailFromVideo(fromPath, folder, imageName) + await generateThumbnailFromVideo({ fromPath, folder, imageName }) const destination = join(folder, imageName) await processImage({ path: pendingImagePath, destination, newSize: size }) @@ -99,7 +99,7 @@ async function jimpProcessor (path: string, destination: string, newSize: { widt logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', path, { err }) const newName = path + '.jpg' - await convertWebPToJPG(path, newName) + await convertWebPToJPG({ path, destination: newName }) await rename(newName, path) sourceImage = await jimpRead(path) -- cgit v1.2.3