X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=3ebf073058bd1f85e00abc49d5a59748ed4c81a3;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=e43ea3f1dad03c62cf65457e40fe461b22c98227;hpb=2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index e43ea3f1d..3ebf07305 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,30 +1,32 @@
-import 'multer'
-import * as sharp from 'sharp'
-import { readFile, remove } from 'fs-extra'
+import { remove, rename } from 'fs-extra'
+import { extname } from 'path'
+import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
 import { logger } from './logger'
 
+const Jimp = require('jimp')
+
 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) {
-    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)
+  }
 
-  await remove(physicalFile.path)
+  if (keepOriginal !== true) await remove(path)
 }
 
 // ---------------------------------------------------------------------------
@@ -32,3 +34,28 @@ async function processImage (
 export {
   processImage
 }
+
+// ---------------------------------------------------------------------------
+
+async function jimpProcessor (path: string, destination: string, newSize: { width: number, height: number }) {
+  let jimpInstance: any
+
+  try {
+    jimpInstance = await Jimp.read(path)
+  } 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)
+
+  await jimpInstance
+    .resize(newSize.width, newSize.height)
+    .quality(80)
+    .writeAsync(destination)
+}