diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-11 14:56:00 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-11 14:56:30 +0200 |
| commit | 32985a0a779e0e2100a3990b1f1188645e58dfb1 (patch) | |
| tree | f96e0166858b10642e2cbf97906d63c57b85ebc1 /server/middlewares | |
| parent | a3c997b34cad79fce92c67951a3c8140a9888973 (diff) | |
| download | PeerTube-32985a0a779e0e2100a3990b1f1188645e58dfb1.tar.gz PeerTube-32985a0a779e0e2100a3990b1f1188645e58dfb1.tar.zst PeerTube-32985a0a779e0e2100a3990b1f1188645e58dfb1.zip | |
Error if importing a torrent with multiple files
Diffstat (limited to 'server/middlewares')
| -rw-r--r-- | server/middlewares/validators/videos/video-imports.ts | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/server/middlewares/validators/videos/video-imports.ts b/server/middlewares/validators/videos/video-imports.ts index c53af3861..d0643ff26 100644 --- a/server/middlewares/validators/videos/video-imports.ts +++ b/server/middlewares/validators/videos/video-imports.ts | |||
| @@ -47,14 +47,12 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ | |||
| 47 | cleanUpReqFiles(req) | 47 | cleanUpReqFiles(req) |
| 48 | return res.status(HttpStatusCode.CONFLICT_409) | 48 | return res.status(HttpStatusCode.CONFLICT_409) |
| 49 | .json({ error: 'HTTP import is not enabled on this instance.' }) | 49 | .json({ error: 'HTTP import is not enabled on this instance.' }) |
| 50 | .end() | ||
| 51 | } | 50 | } |
| 52 | 51 | ||
| 53 | if (CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED !== true && (req.body.magnetUri || torrentFile)) { | 52 | if (CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED !== true && (req.body.magnetUri || torrentFile)) { |
| 54 | cleanUpReqFiles(req) | 53 | cleanUpReqFiles(req) |
| 55 | return res.status(HttpStatusCode.CONFLICT_409) | 54 | return res.status(HttpStatusCode.CONFLICT_409) |
| 56 | .json({ error: 'Torrent/magnet URI import is not enabled on this instance.' }) | 55 | .json({ error: 'Torrent/magnet URI import is not enabled on this instance.' }) |
| 57 | .end() | ||
| 58 | } | 56 | } |
| 59 | 57 | ||
| 60 | if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) | 58 | if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) |
| @@ -65,7 +63,6 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ | |||
| 65 | 63 | ||
| 66 | return res.status(HttpStatusCode.BAD_REQUEST_400) | 64 | return res.status(HttpStatusCode.BAD_REQUEST_400) |
| 67 | .json({ error: 'Should have a magnetUri or a targetUrl or a torrent file.' }) | 65 | .json({ error: 'Should have a magnetUri or a targetUrl or a torrent file.' }) |
| 68 | .end() | ||
| 69 | } | 66 | } |
| 70 | 67 | ||
| 71 | if (!await isImportAccepted(req, res)) return cleanUpReqFiles(req) | 68 | if (!await isImportAccepted(req, res)) return cleanUpReqFiles(req) |