Merge remote-tracking branch 'weblate/develop' into develop

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

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index ba23557ba9eed73f22e488bf3952a3286a07670f..ede22a3cc9c90599ee04b4bc365d18933983ad4d 100644 (file)
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -2,11 +2,12 @@ import * as express from 'express'
 import * as multer from 'multer'
 import { REMOTE_SCHEME } from '../initializers/constants'
 import { logger } from './logger'
-import { deleteFileAsync, generateRandomString } from './utils'
+import { deleteFileAndCatch, generateRandomString } from './utils'
 import { extname } from 'path'
 import { isArray } from './custom-validators/misc'
 import { CONFIG } from '../initializers/config'
 import { getExtFromMimetype } from './video'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 
 function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   if (paramNSFW === 'true') return true
@@ -35,15 +36,15 @@ function cleanUpReqFiles (req: { files: { [fieldname: string]: Express.Multer.Fi
   if (!files) return
 
   if (isArray(files)) {
-    (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path))
+    (files as Express.Multer.File[]).forEach(f => deleteFileAndCatch(f.path))
     return
   }
 
   for (const key of Object.keys(files)) {
     const file = files[key]
 
-    if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
-    else deleteFileAsync(file.path)
+    if (isArray(file)) file.forEach(f => deleteFileAndCatch(f.path))
+    else deleteFileAndCatch(file.path)
   }
 }
 
@@ -61,7 +62,9 @@ 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 (