Skip to content

Commit

Permalink
Add video caption upload documentation and improve error message
Browse files Browse the repository at this point in the history
fixes #2038
  • Loading branch information
rigelk committed Jan 9, 2020
1 parent f44a284 commit 205ed5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions server/middlewares/validators/videos/video-captions.ts
Expand Up @@ -2,7 +2,7 @@ import * as express from 'express'
import { areValidationErrors } from '../utils'
import { isIdOrUUIDValid } from '../../../helpers/custom-validators/misc'
import { body, param } from 'express-validator'
import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
import { CONSTRAINTS_FIELDS, MIMETYPES } from '../../../initializers/constants'
import { UserRight } from '../../../../shared'
import { logger } from '../../../helpers/logger'
import { isVideoCaptionFile, isVideoCaptionLanguageValid } from '../../../helpers/custom-validators/video-captions'
Expand All @@ -13,9 +13,9 @@ const addVideoCaptionValidator = [
param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'),
param('captionLanguage').custom(isVideoCaptionLanguageValid).not().isEmpty().withMessage('Should have a valid caption language'),
body('captionfile')
.custom((value, { req }) => isVideoCaptionFile(req.files, 'captionfile')).withMessage(
'This caption file is not supported or too large. Please, make sure it is of the following type : '
+ CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.EXTNAME.join(', ')
.custom((_, { req }) => isVideoCaptionFile(req.files, 'captionfile')).withMessage(
`This caption file is not supported or too large. Please, make sure it is under ${CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE} and one of the following mimetypes: `
+ Object.keys(MIMETYPES.VIDEO_CAPTIONS.MIMETYPE_EXT).map(key => `${key} (${MIMETYPES.VIDEO_CAPTIONS.MIMETYPE_EXT[key]})`).join(', ')
),

async (req: express.Request, res: express.Response, next: express.NextFunction) => {
Expand Down
2 changes: 1 addition & 1 deletion support/doc/api/openapi.yaml
Expand Up @@ -1292,7 +1292,7 @@ paths:
format: binary
encoding:
captionfile:
contentType: text/vtt, application/x-subrip
contentType: text/vtt, application/x-subrip, text/plain
responses:
'204':
$ref: '#/paths/~1users~1me/put/responses/204'
Expand Down

0 comments on commit 205ed5b

Please sign in to comment.