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

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index f2f6a004f..6f6f8d4da 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,8 +1,13 @@
-import { remove, rename } from 'fs-extra'
-import { convertWebPToJPG } from './ffmpeg-utils'
+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'
 
-const Jimp = require('jimp')
+function generateImageFilename (extension = '.jpg') {
+  return uuidv4() + extension
+}
 
 async function processImage (
   path: string,
@@ -10,18 +15,41 @@ async function processImage (
   newSize: { width: number, height: number },
   keepOriginal = false
 ) {
+  const extension = extname(path)
+
   if (path === destination) {
-    throw new Error('Jimp needs an input path different that the output path.')
+    throw new Error('Jimp/FFmpeg needs an input path different that the output path.')
   }
 
   logger.debug('Processing image %s to %s.', path, destination)
 
-  let jimpInstance: any
+  // 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(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(path)
+    jimpInstance = await Jimp.read(inputBuffer)
   } catch (err) {
-    logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', { 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)
@@ -32,16 +60,34 @@ async function processImage (
 
   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)
-
-  if (keepOriginal !== true) await remove(path)
 }
 
-// ---------------------------------------------------------------------------
+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
 
-export {
-  processImage
+  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
 }