X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fimage-utils.ts;h=5f254a7aaf04594de6af26331ef667b8c0b23eef;hb=6bff8ce23ac9a2de8c6ddcea9df5f7bd2b653156;hp=e43ea3f1dad03c62cf65457e40fe461b22c98227;hpb=88108880bbdba473cfe36ecbebc1c3c4f972e102;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index e43ea3f1d..5f254a7aa 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,30 +1,43 @@
-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 (
-  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.')
+  if (path === destination) {
+    throw new Error('Jimp needs an input path different that the output path.')
   }
 
-  logger.debug('Processing image %s to %s.', physicalFile.path, destination)
+  logger.debug('Processing image %s to %s.', path, destination)
+
+  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 })
 
-  // Avoid sharp cache
-  const buf = await readFile(physicalFile.path)
-  const sharpInstance = sharp(buf)
+    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)
 
-  await remove(physicalFile.path)
+  if (keepOriginal !== true) await remove(path)
 }
 
 // ---------------------------------------------------------------------------