Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / video-imports.ts

diff --git a/server/helpers/custom-validators/video-imports.ts b/server/helpers/custom-validators/video-imports.ts
index 3ad7a464800918382ff2b1d8e1b825b5ee9c2bb5..af93aea56062a86ca17b1e441c8b9593de123632 100644 (file)
--- a/server/helpers/custom-validators/video-imports.ts
+++ b/server/helpers/custom-validators/video-imports.ts
@@ -1,10 +1,8 @@
 import 'multer'
+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'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 function isVideoImportTargetUrlValid (url: string) {
   const isURLOptions = {
@@ -28,23 +26,14 @@ const videoTorrentImportRegex = Object.keys(MIMETYPES.TORRENT.MIMETYPE_EXT)
                                       .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream
                                       .map(m => `(${m})`)
                                       .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 doesVideoImportExist (id: number, res: express.Response) {
-  const videoImport = await VideoImportModel.loadAndPopulateVideo(id)
-
-  if (!videoImport) {
-    res.fail({
-      status: HttpStatusCode.NOT_FOUND_404,
-      message: 'Video import not found'
-    })
-    return false
-  }
-
-  res.locals.videoImport = videoImport
-  return true
+function isVideoImportTorrentFile (files: UploadFilesForCheck) {
+  return isFileValid({
+    files,
+    mimeTypeRegex: videoTorrentImportRegex,
+    field: 'torrentfile',
+    maxSize: CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max,
+    optional: true
+  })
 }
 
 // ---------------------------------------------------------------------------
@@ -52,6 +41,5 @@ async function doesVideoImportExist (id: number, res: express.Response) {
 export {
   isVideoImportStateValid,
   isVideoImportTargetUrlValid,
-  doesVideoImportExist,
   isVideoImportTorrentFile
 }