X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=5f254a7aaf04594de6af26331ef667b8c0b23eef;hb=68e70a745b2010cd0199864a2addd60d8f99c732;hp=bd81aa3bad774d134df064c70c899cafd4a7b9f6;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index bd81aa3ba..5f254a7aa 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,8 +1,9 @@
-import 'multer'
-import * as sharp from 'sharp'
-import { readFile, remove } from 'fs-extra'
+import { remove, rename } from 'fs-extra'
+import { convertWebPToJPG } from './ffmpeg-utils'
 import { logger } from './logger'
 
+const Jimp = require('jimp')
+
 async function processImage (
   path: string,
   destination: string,
@@ -10,20 +11,31 @@ async function processImage (
   keepOriginal = false
 ) {
   if (path === destination) {
-    throw new Error('Sharp needs an input path different that the output path.')
+    throw new Error('Jimp needs an input path different that the output path.')
   }
 
   logger.debug('Processing image %s to %s.', path, destination)
 
-  // Avoid sharp cache
-  const buf = await readFile(path)
-  const sharpInstance = sharp(buf)
+  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 sharpInstance
+  await jimpInstance
     .resize(newSize.width, newSize.height)
-    .toFile(destination)
+    .quality(80)
+    .writeAsync(destination)
 
   if (keepOriginal !== true) await remove(path)
 }