Improve tests when waiting pending jobs

[github/Chocobozzz/PeerTube.git] / server / controllers / static.ts

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 8bebe6fa7e836affbd43c347e9b8f2f03a2a0f97..139ba67cc290b09db1c9867911f14f43669ee04b 100644 (file)
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -77,20 +77,20 @@ async function getPreview (req: express.Request, res: express.Response, next: ex
 }
 
 async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const { video, videoFile } = getVideoAndFileOr404(req, res)
+  const { video, videoFile } = getVideoAndFile(req, res)
   if (!videoFile) return res.status(404).end()
 
   return res.download(video.getTorrentFilePath(videoFile), `${video.name}-${videoFile.resolution}p.torrent`)
 }
 
 async function downloadVideoFile (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const { video, videoFile } = getVideoAndFileOr404(req, res)
+  const { video, videoFile } = getVideoAndFile(req, res)
   if (!videoFile) return res.status(404).end()
 
   return res.download(video.getVideoFilePath(videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`)
 }
 
-function getVideoAndFileOr404 (req: express.Request, res: express.Response) {
+function getVideoAndFile (req: express.Request, res: express.Response) {
   const resolution = parseInt(req.params.resolution, 10)
   const video: VideoModel = res.locals.video