-import * as express from 'express'
-import * as multer from 'multer'
-import { extname } from 'path'
-import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
+import express, { RequestHandler } from 'express'
+import multer, { diskStorage } from 'multer'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
import { CONFIG } from '../initializers/config'
import { REMOTE_SCHEME } from '../initializers/constants'
import { isArray } from './custom-validators/misc'
return null
}
-function cleanUpReqFiles (
- req: { files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] }
-) {
+function cleanUpReqFiles (req: express.Request) {
const filesObject = req.files
if (!filesObject) return
return host
}
-function badRequest (req: express.Request, res: express.Response) {
+function badRequest (_req: express.Request, res: express.Response) {
return res.type('json')
.status(HttpStatusCode.BAD_REQUEST_400)
.end()
function createReqFiles (
fieldNames: string[],
mimeTypes: { [id: string]: string | string[] },
- destinations: { [fieldName: string]: string }
-) {
- const storage = multer.diskStorage({
+ destination = CONFIG.STORAGE.TMP_DIR
+): RequestHandler {
+ const storage = diskStorage({
destination: (req, file, cb) => {
- cb(null, destinations[file.fieldname])
+ cb(null, destination)
},
- filename: async (req, file, cb) => {
- let extension: string
- const fileExtension = extname(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 {
- randomString = await generateRandomString(16)
- } catch (err) {
- logger.error('Cannot generate random string for file name.', { err })
- randomString = 'fake-random-string'
- }
-
- cb(null, randomString + extension)
+ filename: (req, file, cb) => {
+ return generateReqFilename(file, mimeTypes, cb)
}
})
return multer({ storage }).fields(fields)
}
+function createAnyReqFiles (
+ mimeTypes: { [id: string]: string | string[] },
+ fileFilter: (req: express.Request, file: Express.Multer.File, cb: (err: Error, result: boolean) => void) => void
+): RequestHandler {
+ const storage = diskStorage({
+ destination: (req, file, cb) => {
+ cb(null, CONFIG.STORAGE.TMP_DIR)
+ },
+
+ filename: (req, file, cb) => {
+ return generateReqFilename(file, mimeTypes, cb)
+ }
+ })
+
+ return multer({ storage, fileFilter }).any()
+}
+
function isUserAbleToSearchRemoteURI (res: express.Response) {
const user = res.locals.oauth ? res.locals.oauth.token.User : undefined
export {
buildNSFWFilter,
getHostWithPort,
+ createAnyReqFiles,
isUserAbleToSearchRemoteURI,
badRequest,
createReqFiles,
cleanUpReqFiles,
getCountVideos
}
+
+// ---------------------------------------------------------------------------
+
+async function generateReqFilename (
+ file: Express.Multer.File,
+ mimeTypes: { [id: string]: string | string[] },
+ cb: (err: Error, name: string) => void
+) {
+ 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 {
+ randomString = await generateRandomString(16)
+ } catch (err) {
+ logger.error('Cannot generate random string for file name.', { err })
+ randomString = 'fake-random-string'
+ }
+
+ cb(null, randomString + extension)
+}