X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=6f6f8d4da379952698f2fee76e64f956d104d9e7;hb=84531547bc0934a2abda586d539f7455b455d488;hp=eeaef0f5d3dc9a0e736538f5744d8498dd6622d1;hpb=e8bafea35bc930cb8ac5b2d521a188642a1adffe;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index eeaef0f5d..6f6f8d4da 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,35 +1,93 @@
-import 'multer'
-import * as sharp from 'sharp'
-import { readFile, remove } from 'fs-extra'
+import { copy, readFile, remove, rename } from 'fs-extra'
+import * as Jimp from 'jimp'
+import { extname } from 'path'
+import { v4 as uuidv4 } from 'uuid'
+import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
 import { logger } from './logger'
 
+function generateImageFilename (extension = '.jpg') {
+  return uuidv4() + extension
+}
+
 async function processImage (
-  physicalFile: { path: string },
+  path: string,
   destination: string,
   newSize: { width: number, height: number },
   keepOriginal = false
 ) {
-  if (physicalFile.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)
+  const extension = extname(path)
 
-  // Avoid sharp cache
-  const buf = await readFile(physicalFile.path)
-  const sharpInstance = sharp(buf)
+  if (path === destination) {
+    throw new Error('Jimp/FFmpeg needs an input path different that the output path.')
+  }
 
-  await remove(destination)
+  logger.debug('Processing image %s to %s.', path, destination)
 
-  await sharpInstance
-    .resize(newSize.width, newSize.height)
-    .toFile(destination)
+  // Use FFmpeg to process GIF
+  if (extension === '.gif') {
+    await processGIF(path, destination, newSize)
+  } else {
+    await jimpProcessor(path, destination, newSize, extension)
+  }
 
-  if (keepOriginal !== true) await remove(physicalFile.path)
+  if (keepOriginal !== true) await remove(path)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
+  generateImageFilename,
   processImage
 }
+
+// ---------------------------------------------------------------------------
+
+async function jimpProcessor (path: string, destination: string, newSize: { width: number, height: number }, inputExt: string) {
+  let jimpInstance: Jimp
+  const inputBuffer = await readFile(path)
+
+  try {
+    jimpInstance = await Jimp.read(inputBuffer)
+  } catch (err) {
+    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 rename(newName, path)
+
+    jimpInstance = await Jimp.read(path)
+  }
+
+  await remove(destination)
+
+  // Optimization if the source file has the appropriate size
+  if (await skipProcessing({ jimpInstance, newSize, imageBytes: inputBuffer.byteLength, inputExt, outputExt: extname(destination) })) {
+    return copy(path, destination)
+  }
+
+  await jimpInstance
+    .resize(newSize.width, newSize.height)
+    .quality(80)
+    .writeAsync(destination)
+}
+
+function skipProcessing (options: {
+  jimpInstance: Jimp
+  newSize: { width: number, height: number }
+  imageBytes: number
+  inputExt: string
+  outputExt: string
+}) {
+  const { jimpInstance, newSize, imageBytes, inputExt, outputExt } = options
+  const { width, height } = newSize
+
+  if (jimpInstance.getWidth() > width || jimpInstance.getHeight() > height) return false
+  if (inputExt !== outputExt) return false
+
+  const kB = 1000
+
+  if (height >= 1000) return imageBytes <= 200 * kB
+  if (height >= 500) return imageBytes <= 100 * kB
+
+  return imageBytes <= 15 * kB
+}