diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
| commit | 3d52b300ea79bec21f090e2447c4808307078618 (patch) | |
| tree | 5a68db9d557eb9449533162cf01f974e60b16885 /server/helpers/custom-validators | |
| parent | 60979b076de00a7c7f6dde26617cd39357d9fc6d (diff) | |
| parent | 2769e297ca6703f761f9b57792585eb1fc5aac49 (diff) | |
| download | PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.gz PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.zst PeerTube-3d52b300ea79bec21f090e2447c4808307078618.zip | |
Merge branch 'release/beta-10' into develop
Diffstat (limited to 'server/helpers/custom-validators')
| -rw-r--r-- | server/helpers/custom-validators/video-captions.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/helpers/custom-validators/video-captions.ts b/server/helpers/custom-validators/video-captions.ts index 6b1729f36..177e9e86e 100644 --- a/server/helpers/custom-validators/video-captions.ts +++ b/server/helpers/custom-validators/video-captions.ts | |||
| @@ -8,7 +8,9 @@ function isVideoCaptionLanguageValid (value: any) { | |||
| 8 | return exists(value) && VIDEO_LANGUAGES[ value ] !== undefined | 8 | return exists(value) && VIDEO_LANGUAGES[ value ] !== undefined |
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | const videoCaptionTypes = Object.keys(VIDEO_CAPTIONS_MIMETYPE_EXT).map(m => `(${m})`) | 11 | const videoCaptionTypes = Object.keys(VIDEO_CAPTIONS_MIMETYPE_EXT) |
| 12 | .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream >< | ||
| 13 | .map(m => `(${m})`) | ||
| 12 | const videoCaptionTypesRegex = videoCaptionTypes.join('|') | 14 | const videoCaptionTypesRegex = videoCaptionTypes.join('|') |
| 13 | function isVideoCaptionFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) { | 15 | function isVideoCaptionFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) { |
| 14 | return isFileValid(files, videoCaptionTypesRegex, field, CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max) | 16 | return isFileValid(files, videoCaptionTypesRegex, field, CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max) |