X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fexpress-utils.ts;h=c299b70f139ef590432574fe57e524c1c55715e9;hb=f645af439669b084dc7ea360751a0e4c1980c81b;hp=e0a1d56a587759adad40cdec568594b2ee41900a;hpb=74dc3bca2b14f5fd3fe80c394dfc34177a46db77;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index e0a1d56a5..c299b70f1 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -1,18 +1,20 @@
 import * as express from 'express'
 import * as multer from 'multer'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
+import { CONFIG } from '../initializers/config'
 import { REMOTE_SCHEME } from '../initializers/constants'
-import { logger } from './logger'
-import { deleteFileAsync, generateRandomString } from './utils'
-import { extname } from 'path'
+import { getLowercaseExtension } from './core-utils'
 import { isArray } from './custom-validators/misc'
-import { CONFIG } from '../initializers/config'
+import { logger } from './logger'
+import { deleteFileAndCatch, generateRandomString } from './utils'
+import { getExtFromMimetype } from './video'
 
 function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   if (paramNSFW === 'true') return true
   if (paramNSFW === 'false') return false
   if (paramNSFW === 'both') return undefined
 
-  if (res && res.locals.oauth) {
+  if (res?.locals.oauth) {
     const user = res.locals.oauth.token.User
 
     // User does not want NSFW videos
@@ -28,21 +30,19 @@ function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   return null
 }
 
-function cleanUpReqFiles (req: { files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[] }) {
-  const files = req.files
-
-  if (!files) return
+function cleanUpReqFiles (req: express.Request) {
+  const filesObject = req.files
+  if (!filesObject) return
 
-  if (isArray(files)) {
-    (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path))
+  if (isArray(filesObject)) {
+    filesObject.forEach(f => deleteFileAndCatch(f.path))
     return
   }
 
-  for (const key of Object.keys(files)) {
-    const file = files[ key ]
+  for (const key of Object.keys(filesObject)) {
+    const files = filesObject[key]
 
-    if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
-    else deleteFileAsync(file.path)
+    files.forEach(f => deleteFileAndCatch(f.path))
   }
 }
 
@@ -60,21 +60,34 @@ function getHostWithPort (host: string) {
 }
 
 function badRequest (req: express.Request, res: express.Response) {
-  return res.type('json').status(400).end()
+  return res.type('json')
+            .status(HttpStatusCode.BAD_REQUEST_400)
+            .end()
 }
 
 function createReqFiles (
   fieldNames: string[],
-  mimeTypes: { [ id: string ]: string },
-  destinations: { [ fieldName: string ]: string }
+  mimeTypes: { [id: string]: string | string[] },
+  destinations: { [fieldName: string]: string }
 ) {
   const storage = multer.diskStorage({
     destination: (req, file, cb) => {
-      cb(null, destinations[ file.fieldname ])
+      cb(null, destinations[file.fieldname])
     },
 
     filename: async (req, file, cb) => {
-      const extension = mimeTypes[ file.mimetype ] || extname(file.originalname)
+      let extension: string
+      const fileExtension = getLowercaseExtension(file.originalname)
+      const extensionFromMimetype = getExtFromMimetype(mimeTypes, file.mimetype)
+
+      // Take the file extension if we don't understand the mime type
+      if (!extensionFromMimetype) {
+        extension = fileExtension
+      } else {
+        // Take the first available extension for this mimetype
+        extension = extensionFromMimetype
+      }
+
       let randomString = ''
 
       try {
@@ -88,7 +101,7 @@ function createReqFiles (
     }
   })
 
-  let fields: { name: string, maxCount: number }[] = []
+  const fields: { name: string, maxCount: number }[] = []
   for (const fieldName of fieldNames) {
     fields.push({
       name: fieldName,
@@ -106,6 +119,10 @@ function isUserAbleToSearchRemoteURI (res: express.Response) {
     (CONFIG.SEARCH.REMOTE_URI.USERS === true && user !== undefined)
 }
 
+function getCountVideos (req: express.Request) {
+  return req.query.skipCount !== true
+}
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -114,5 +131,6 @@ export {
   isUserAbleToSearchRemoteURI,
   badRequest,
   createReqFiles,
-  cleanUpReqFiles
+  cleanUpReqFiles,
+  getCountVideos
 }