emit more specific status codes on video upload (#3423)

[github/Chocobozzz/PeerTube.git] / server / helpers / image-utils.ts

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index b1c7d3d476c549c395dbb8ff8207fc469f21d52b..3ebf073058bd1f85e00abc49d5a59748ed4c81a3 100644 (file)
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -1,6 +1,8 @@
-import 'multer'
-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 (
@@ -9,22 +11,20 @@ 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)
 
-  // Avoid sharp cache
-  const buf = await readFile(path)
-  const jimpInstance = await Jimp.read(buf)
-
-  await remove(destination)
-
-  await jimpInstance
-    .resize(newSize.width, newSize.height)
-    .quality(80)
-    .writeAsync(destination)
+  // Use FFmpeg to process GIF
+  if (extension === '.gif') {
+    await processGIF(path, destination, newSize)
+  } else {
+    await jimpProcessor(path, destination, newSize)
+  }
 
   if (keepOriginal !== true) await remove(path)
 }
@@ -34,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)
+}