import { values } from 'lodash'
-import * as validator from 'validator'
+import validator from 'validator'
import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
import {
CONSTRAINTS_FIELDS,
VIDEO_LICENCES,
VIDEO_PRIVACIES,
VIDEO_RATE_TYPES,
- VIDEO_STATES
+ VIDEO_STATES,
+ VIDEO_LIVE
} from '../../initializers/constants'
-import { exists, isArray, isDateValid, isFileValid } from './misc'
+import { exists, isArray, isDateValid, isFileMimeTypeValid, isFileValid } from './misc'
import * as magnetUtil from 'magnet-uri'
const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
function isVideoFilterValid (filter: VideoFilter) {
- return filter === 'local' || filter === 'all-local'
+ return filter === 'local' || filter === 'all-local' || filter === 'all'
}
function isVideoCategoryValid (value: any) {
- return value === null || VIDEO_CATEGORIES[ value ] !== undefined
+ return value === null || VIDEO_CATEGORIES[value] !== undefined
}
function isVideoStateValid (value: any) {
- return exists(value) && VIDEO_STATES[ value ] !== undefined
+ return exists(value) && VIDEO_STATES[value] !== undefined
}
function isVideoLicenceValid (value: any) {
- return value === null || VIDEO_LICENCES[ value ] !== undefined
+ return value === null || VIDEO_LICENCES[value] !== undefined
}
function isVideoLanguageValid (value: any) {
}
function isVideoRatingTypeValid (value: string) {
- return value === 'none' || values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1
+ return value === 'none' || values(VIDEO_RATE_TYPES).includes(value as VideoRateType)
}
function isVideoFileExtnameValid (value: string) {
- return exists(value) && MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined
+ return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined)
}
-function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
- const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT)
- .map(m => `(${m})`)
- .join('|')
-
- return isFileValid(files, videoFileTypesRegex, 'videofile', null)
+function isVideoFileMimeTypeValid (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
+ return isFileMimeTypeValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile')
}
const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME
}
function isVideoPrivacyValid (value: number) {
- return VIDEO_PRIVACIES[ value ] !== undefined
+ return VIDEO_PRIVACIES[value] !== undefined
}
function isScheduleVideoUpdatePrivacyValid (value: number) {
isVideoFPSResolutionValid,
isScheduleVideoUpdatePrivacyValid,
isVideoOriginallyPublishedAtValid,
- isVideoFile,
isVideoMagnetUriValid,
isVideoStateValid,
isVideoViewsValid,
isVideoRatingTypeValid,
isVideoFileExtnameValid,
+ isVideoFileMimeTypeValid,
isVideoDurationValid,
isVideoTagValid,
isVideoPrivacyValid,