import * as express from 'express'
-import 'express-validator'
-import { param, body } from 'express-validator/check'
-import { exists, isBooleanValid, isIdOrUUIDValid, toIntOrNull } from '../../helpers/custom-validators/misc'
-import { isVideoExist } from '../../helpers/custom-validators/videos'
+import { body, param } from 'express-validator'
+import { exists, isBooleanValid, isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
-import { VideoModel } from '../../models/video/video'
import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy'
import { isHostValid } from '../../helpers/custom-validators/servers'
-import { getServerActor } from '../../helpers/utils'
-import { ActorFollowModel } from '../../models/activitypub/actor-follow'
-import { SERVER_ACTOR_NAME } from '../../initializers'
import { ServerModel } from '../../models/server/server'
+import { doesVideoExist } from '../../helpers/middlewares'
-const videoRedundancyGetValidator = [
+const videoFileRedundancyGetValidator = [
param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'),
param('resolution')
.customSanitizer(toIntOrNull)
.custom(exists).withMessage('Should have a valid fps'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking videoRedundancyGetValidator parameters', { parameters: req.params })
+ logger.debug('Checking videoFileRedundancyGetValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
- if (!await isVideoExist(req.params.videoId, res)) return
+ if (!await doesVideoExist(req.params.videoId, res)) return
+
+ const video = res.locals.videoAll
+
+ const paramResolution = req.params.resolution as unknown as number // We casted to int above
+ const paramFPS = req.params.fps as unknown as number // We casted to int above
- const video: VideoModel = res.locals.video
const videoFile = video.VideoFiles.find(f => {
- return f.resolution === req.params.resolution && (!req.params.fps || f.fps === req.params.fps)
+ return f.resolution === paramResolution && (!req.params.fps || paramFPS)
})
if (!videoFile) return res.status(404).json({ error: 'Video file not found.' })
res.locals.videoFile = videoFile
- const videoRedundancy = await VideoRedundancyModel.loadByFileId(videoFile.id)
- if (!videoRedundancy)return res.status(404).json({ error: 'Video redundancy not found.' })
+ const videoRedundancy = await VideoRedundancyModel.loadLocalByFileId(videoFile.id)
+ if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' })
+ res.locals.videoRedundancy = videoRedundancy
+
+ return next()
+ }
+]
+
+const videoPlaylistRedundancyGetValidator = [
+ param('videoId')
+ .custom(isIdOrUUIDValid)
+ .not().isEmpty().withMessage('Should have a valid video id'),
+ param('streamingPlaylistType')
+ .customSanitizer(toIntOrNull)
+ .custom(exists).withMessage('Should have a valid streaming playlist type'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking videoPlaylistRedundancyGetValidator parameters', { parameters: req.params })
+
+ if (areValidationErrors(req, res)) return
+ if (!await doesVideoExist(req.params.videoId, res)) return
+
+ const video = res.locals.videoAll
+
+ const paramPlaylistType = req.params.streamingPlaylistType as unknown as number // We casted to int above
+ const videoStreamingPlaylist = video.VideoStreamingPlaylists.find(p => p.type === paramPlaylistType)
+
+ if (!videoStreamingPlaylist) return res.status(404).json({ error: 'Video playlist not found.' })
+ res.locals.videoStreamingPlaylist = videoStreamingPlaylist
+
+ const videoRedundancy = await VideoRedundancyModel.loadLocalByStreamingPlaylistId(videoStreamingPlaylist.id)
+ if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' })
res.locals.videoRedundancy = videoRedundancy
return next()
const updateServerRedundancyValidator = [
param('host').custom(isHostValid).withMessage('Should have a valid host'),
body('redundancyAllowed')
- .toBoolean()
+ .customSanitizer(toBooleanOrNull)
.custom(isBooleanValid).withMessage('Should have a valid redundancyAllowed attribute'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
// ---------------------------------------------------------------------------
export {
- videoRedundancyGetValidator,
+ videoFileRedundancyGetValidator,
+ videoPlaylistRedundancyGetValidator,
updateServerRedundancyValidator
}