diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-12-08 21:16:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 21:16:10 +0100 |
commit | f2eb23cd87cf32b8fe545178143b5f49e06a58da (patch) | |
tree | af7d59945af70e28fd85047e2c688c59a908f548 /server/helpers/custom-validators/videos.ts | |
parent | c977fd3ec931c059111ddb2b8d6ddbb20b6b99a1 (diff) | |
download | PeerTube-f2eb23cd87cf32b8fe545178143b5f49e06a58da.tar.gz PeerTube-f2eb23cd87cf32b8fe545178143b5f49e06a58da.tar.zst PeerTube-f2eb23cd87cf32b8fe545178143b5f49e06a58da.zip |
emit more specific status codes on video upload (#3423)
- reduce http status codes list to potentially useful codes
- convert more codes to typed ones
- factorize html generator for error responses
Diffstat (limited to 'server/helpers/custom-validators/videos.ts')
-rw-r--r-- | server/helpers/custom-validators/videos.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index 8b309ae42..87966798f 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts | |||
@@ -11,7 +11,7 @@ import { | |||
11 | VIDEO_STATES, | 11 | VIDEO_STATES, |
12 | VIDEO_LIVE | 12 | VIDEO_LIVE |
13 | } from '../../initializers/constants' | 13 | } from '../../initializers/constants' |
14 | import { exists, isArray, isDateValid, isFileValid } from './misc' | 14 | import { exists, isArray, isDateValid, isFileMimeTypeValid, isFileValid } from './misc' |
15 | import * as magnetUtil from 'magnet-uri' | 15 | import * as magnetUtil from 'magnet-uri' |
16 | 16 | ||
17 | const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS | 17 | const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS |
@@ -81,8 +81,8 @@ function isVideoFileExtnameValid (value: string) { | |||
81 | return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined) | 81 | return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined) |
82 | } | 82 | } |
83 | 83 | ||
84 | function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { | 84 | function isVideoFileMimeTypeValid (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { |
85 | return isFileValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile', null) | 85 | return isFileMimeTypeValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile') |
86 | } | 86 | } |
87 | 87 | ||
88 | const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME | 88 | const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME |
@@ -143,12 +143,12 @@ export { | |||
143 | isVideoFPSResolutionValid, | 143 | isVideoFPSResolutionValid, |
144 | isScheduleVideoUpdatePrivacyValid, | 144 | isScheduleVideoUpdatePrivacyValid, |
145 | isVideoOriginallyPublishedAtValid, | 145 | isVideoOriginallyPublishedAtValid, |
146 | isVideoFile, | ||
147 | isVideoMagnetUriValid, | 146 | isVideoMagnetUriValid, |
148 | isVideoStateValid, | 147 | isVideoStateValid, |
149 | isVideoViewsValid, | 148 | isVideoViewsValid, |
150 | isVideoRatingTypeValid, | 149 | isVideoRatingTypeValid, |
151 | isVideoFileExtnameValid, | 150 | isVideoFileExtnameValid, |
151 | isVideoFileMimeTypeValid, | ||
152 | isVideoDurationValid, | 152 | isVideoDurationValid, |
153 | isVideoTagValid, | 153 | isVideoTagValid, |
154 | isVideoPrivacyValid, | 154 | isVideoPrivacyValid, |