From b764380ac23f4e9d4677d08acdc3474c2931a16d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jan 2020 10:11:28 +0100 Subject: Add ability to list redundancies --- server/middlewares/validators/redundancy.ts | 74 +++++++++++++++++++++++++++-- server/middlewares/validators/sort.ts | 3 ++ 2 files changed, 74 insertions(+), 3 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/redundancy.ts b/server/middlewares/validators/redundancy.ts index 8098e3a44..16b42fc0d 100644 --- a/server/middlewares/validators/redundancy.ts +++ b/server/middlewares/validators/redundancy.ts @@ -1,12 +1,13 @@ import * as express from 'express' -import { body, param } from 'express-validator' -import { exists, isBooleanValid, isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' +import { body, param, query } from 'express-validator' +import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' import { logger } from '../../helpers/logger' import { areValidationErrors } from './utils' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' import { isHostValid } from '../../helpers/custom-validators/servers' import { ServerModel } from '../../models/server/server' import { doesVideoExist } from '../../helpers/middlewares' +import { isVideoRedundancyTarget } from '@server/helpers/custom-validators/video-redundancies' const videoFileRedundancyGetValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'), @@ -101,10 +102,77 @@ const updateServerRedundancyValidator = [ } ] +const listVideoRedundanciesValidator = [ + query('target') + .custom(isVideoRedundancyTarget).withMessage('Should have a valid video redundancies target'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking listVideoRedundanciesValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + return next() + } +] + +const addVideoRedundancyValidator = [ + body('videoId') + .custom(isIdValid) + .withMessage('Should have a valid video id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking addVideoRedundancyValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return + + if (res.locals.onlyVideo.remote === false) { + return res.status(400) + .json({ error: 'Cannot create a redundancy on a local video' }) + .end() + } + + const alreadyExists = await VideoRedundancyModel.isLocalByVideoUUIDExists(res.locals.onlyVideo.uuid) + if (alreadyExists) { + return res.status(409) + .json({ error: 'This video is already duplicated by your instance.' }) + } + + return next() + } +] + +const removeVideoRedundancyValidator = [ + param('redundancyId') + .custom(isIdValid) + .withMessage('Should have a valid redundancy id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking removeVideoRedundancyValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + const redundancy = await VideoRedundancyModel.loadByIdWithVideo(parseInt(req.params.redundancyId, 10)) + if (!redundancy) { + return res.status(404) + .json({ error: 'Video redundancy not found' }) + .end() + } + + res.locals.videoRedundancy = redundancy + + return next() + } +] + // --------------------------------------------------------------------------- export { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator, - updateServerRedundancyValidator + updateServerRedundancyValidator, + listVideoRedundanciesValidator, + addVideoRedundancyValidator, + removeVideoRedundancyValidator } diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts index c75e701d6..b76dab722 100644 --- a/server/middlewares/validators/sort.ts +++ b/server/middlewares/validators/sort.ts @@ -23,6 +23,7 @@ const SORTABLE_USER_NOTIFICATIONS_COLUMNS = createSortableColumns(SORTABLE_COLUM const SORTABLE_VIDEO_PLAYLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_PLAYLISTS) const SORTABLE_PLUGINS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.PLUGINS) const SORTABLE_AVAILABLE_PLUGINS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.AVAILABLE_PLUGINS) +const SORTABLE_VIDEO_REDUNDANCIES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_REDUNDANCIES) const usersSortValidator = checkSort(SORTABLE_USERS_COLUMNS) const accountsSortValidator = checkSort(SORTABLE_ACCOUNTS_COLUMNS) @@ -45,6 +46,7 @@ const userNotificationsSortValidator = checkSort(SORTABLE_USER_NOTIFICATIONS_COL const videoPlaylistsSortValidator = checkSort(SORTABLE_VIDEO_PLAYLISTS_COLUMNS) const pluginsSortValidator = checkSort(SORTABLE_PLUGINS_COLUMNS) const availablePluginsSortValidator = checkSort(SORTABLE_AVAILABLE_PLUGINS_COLUMNS) +const videoRedundanciesSortValidator = checkSort(SORTABLE_VIDEO_REDUNDANCIES_COLUMNS) // --------------------------------------------------------------------------- @@ -69,5 +71,6 @@ export { serversBlocklistSortValidator, userNotificationsSortValidator, videoPlaylistsSortValidator, + videoRedundanciesSortValidator, pluginsSortValidator } -- cgit v1.2.3