Fix preview upload with capitalized ext

[github/Chocobozzz/PeerTube.git] / server / helpers / middlewares / video-playlists.ts

diff --git a/server/helpers/middlewares/video-playlists.ts b/server/helpers/middlewares/video-playlists.ts
index 735bf362f77b715c16ef4980b7eaefe9ea7f2c98..d2dd80a352f05a0a6e7760c1b9d8ae53e916e0a0 100644 (file)
--- a/server/helpers/middlewares/video-playlists.ts
+++ b/server/helpers/middlewares/video-playlists.ts
@@ -1,21 +1,21 @@
 import * as express from 'express'
 import { VideoPlaylistModel } from '../../models/video/video-playlist'
+import { MVideoPlaylist } from '../../types/models/video/video-playlist'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
-async function doesVideoPlaylistExist (id: number | string, res: express.Response, fetchType: 'summary' | 'all' = 'summary') {
-  const videoPlaylist = fetchType === 'summary'
-    ? await VideoPlaylistModel.loadWithAccountAndChannelSummary(id, undefined)
-    : await VideoPlaylistModel.loadWithAccountAndChannel(id, undefined)
+export type VideoPlaylistFetchType = 'summary' | 'all'
+async function doesVideoPlaylistExist (id: number | string, res: express.Response, fetchType: VideoPlaylistFetchType = 'summary') {
+  if (fetchType === 'summary') {
+    const videoPlaylist = await VideoPlaylistModel.loadWithAccountAndChannelSummary(id, undefined)
+    res.locals.videoPlaylistSummary = videoPlaylist
 
-  if (!videoPlaylist) {
-    res.status(404)
-       .json({ error: 'Video playlist not found' })
-       .end()
-
-    return false
+    return handleVideoPlaylist(videoPlaylist, res)
   }
 
-  res.locals.videoPlaylist = videoPlaylist
-  return true
+  const videoPlaylist = await VideoPlaylistModel.loadWithAccountAndChannel(id, undefined)
+  res.locals.videoPlaylistFull = videoPlaylist
+
+  return handleVideoPlaylist(videoPlaylist, res)
 }
 
 // ---------------------------------------------------------------------------
@@ -23,3 +23,17 @@ async function doesVideoPlaylistExist (id: number | string, res: express.Respons
 export {
   doesVideoPlaylistExist
 }
+
+// ---------------------------------------------------------------------------
+
+function handleVideoPlaylist (videoPlaylist: MVideoPlaylist, res: express.Response) {
+  if (!videoPlaylist) {
+    res.status(HttpStatusCode.NOT_FOUND_404)
+       .json({ error: 'Video playlist not found' })
+       .end()
+
+    return false
+  }
+
+  return true
+}