-import 'express-validator'
import 'multer'
-import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers'
+import { UploadFilesForCheck } from 'express'
+import validator from 'validator'
+import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers/constants'
import { exists, isFileValid } from './misc'
-import * as express from 'express'
-import { VideoImportModel } from '../../models/video/video-import'
function isVideoImportTargetUrlValid (url: string) {
const isURLOptions = {
}
function isVideoImportStateValid (value: any) {
- return exists(value) && VIDEO_IMPORT_STATES[ value ] !== undefined
+ return exists(value) && VIDEO_IMPORT_STATES[value] !== undefined
}
-const videoTorrentImportTypes = Object.keys(MIMETYPES.TORRENT.MIMETYPE_EXT).map(m => `(${m})`)
-const videoTorrentImportRegex = videoTorrentImportTypes.join('|')
-function isVideoImportTorrentFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
- return isFileValid(files, videoTorrentImportRegex, 'torrentfile', CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max, true)
-}
-
-async function isVideoImportExist (id: number, res: express.Response) {
- const videoImport = await VideoImportModel.loadAndPopulateVideo(id)
-
- if (!videoImport) {
- res.status(404)
- .json({ error: 'Video import not found' })
- .end()
-
- return false
- }
-
- res.locals.videoImport = videoImport
- return true
+const videoTorrentImportRegex = Object.keys(MIMETYPES.TORRENT.MIMETYPE_EXT)
+ .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream
+ .map(m => `(${m})`)
+ .join('|')
+function isVideoImportTorrentFile (files: UploadFilesForCheck) {
+ return isFileValid({
+ files,
+ mimeTypeRegex: videoTorrentImportRegex,
+ field: 'torrentfile',
+ maxSize: CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max,
+ optional: true
+ })
}
// ---------------------------------------------------------------------------
export {
isVideoImportStateValid,
isVideoImportTargetUrlValid,
- isVideoImportExist,
isVideoImportTorrentFile
}