diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-04-07 10:40:52 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-04-07 10:40:52 +0200 |
| commit | edaf5b862ab6845d0cc528703cc45c9a9acd4693 (patch) | |
| tree | 2c3a526a2872e4e32114eb04b7933bc95b0d3eb8 | |
| parent | be6343d26ec07fd792de069229bd3be27e72d129 (diff) | |
| download | PeerTube-edaf5b862ab6845d0cc528703cc45c9a9acd4693.tar.gz PeerTube-edaf5b862ab6845d0cc528703cc45c9a9acd4693.tar.zst PeerTube-edaf5b862ab6845d0cc528703cc45c9a9acd4693.zip | |
Fix torrent import on windows
| -rw-r--r-- | server/helpers/custom-validators/video-captions.ts | 6 | ||||
| -rw-r--r-- | server/helpers/custom-validators/video-imports.ts | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/server/helpers/custom-validators/video-captions.ts b/server/helpers/custom-validators/video-captions.ts index 9abbce04a..528edf60c 100644 --- a/server/helpers/custom-validators/video-captions.ts +++ b/server/helpers/custom-validators/video-captions.ts | |||
| @@ -5,10 +5,10 @@ function isVideoCaptionLanguageValid (value: any) { | |||
| 5 | return exists(value) && VIDEO_LANGUAGES[value] !== undefined | 5 | return exists(value) && VIDEO_LANGUAGES[value] !== undefined |
| 6 | } | 6 | } |
| 7 | 7 | ||
| 8 | const videoCaptionTypes = Object.keys(MIMETYPES.VIDEO_CAPTIONS.MIMETYPE_EXT) | 8 | const videoCaptionTypesRegex = Object.keys(MIMETYPES.VIDEO_CAPTIONS.MIMETYPE_EXT) |
| 9 | .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream >< | 9 | .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream |
| 10 | .map(m => `(${m})`) | 10 | .map(m => `(${m})`) |
| 11 | const videoCaptionTypesRegex = videoCaptionTypes.join('|') | 11 | .join('|') |
| 12 | function isVideoCaptionFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) { | 12 | function isVideoCaptionFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) { |
| 13 | return isFileValid(files, videoCaptionTypesRegex, field, CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max) | 13 | return isFileValid(files, videoCaptionTypesRegex, field, CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max) |
| 14 | } | 14 | } |
diff --git a/server/helpers/custom-validators/video-imports.ts b/server/helpers/custom-validators/video-imports.ts index c571f5ddd..33a1fa8ab 100644 --- a/server/helpers/custom-validators/video-imports.ts +++ b/server/helpers/custom-validators/video-imports.ts | |||
| @@ -23,8 +23,10 @@ function isVideoImportStateValid (value: any) { | |||
| 23 | return exists(value) && VIDEO_IMPORT_STATES[value] !== undefined | 23 | return exists(value) && VIDEO_IMPORT_STATES[value] !== undefined |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | const videoTorrentImportTypes = Object.keys(MIMETYPES.TORRENT.MIMETYPE_EXT).map(m => `(${m})`) | 26 | const videoTorrentImportRegex = Object.keys(MIMETYPES.TORRENT.MIMETYPE_EXT) |
| 27 | const videoTorrentImportRegex = videoTorrentImportTypes.join('|') | 27 | .concat([ 'application/octet-stream' ]) // MacOS sends application/octet-stream |
| 28 | .map(m => `(${m})`) | ||
| 29 | .join('|') | ||
| 28 | function isVideoImportTorrentFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { | 30 | function isVideoImportTorrentFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { |
| 29 | return isFileValid(files, videoTorrentImportRegex, 'torrentfile', CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max, true) | 31 | return isFileValid(files, videoTorrentImportRegex, 'torrentfile', CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max, true) |
| 30 | } | 32 | } |