OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Try to fix Mac video upload

pull/1567/head
Chocobozzz 2019-01-24 15:23:06 +01:00
parent 572b8e02e2
commit 307902e2b3
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/+accounts/accounts.component.ts
View File

@ -26,8 +26,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
private notifier: Notifier, private notifier: Notifier,
private restExtractor: RestExtractor, private restExtractor: RestExtractor,
private redirectService: RedirectService, private redirectService: RedirectService,
private authService: AuthService, private authService: AuthService
private i18n: I18n
) {} ) {}
ngOnInit () { ngOnInit () {

4
server/helpers/custom-validators/videos.ts
View File

@ -88,8 +88,8 @@ function isVideoFileExtnameValid (value: string) {
function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT)
.map(m => `(${m})`) .map(m => `(${m})`)
.join('|') .join('|')
return isFileValid(files, videoFileTypesRegex, 'videofile', null) return isFileValid(files, videoFileTypesRegex, 'videofile', null)
} }

4
server/initializers/constants.ts
View File

@ -795,7 +795,9 @@ function buildVideoMimetypeExt () {
'video/quicktime': '.mov', 'video/quicktime': '.mov',
'video/x-msvideo': '.avi', 'video/x-msvideo': '.avi',
'video/x-flv': '.flv', 'video/x-flv': '.flv',
'video/x-matroska': '.mkv' 'video/x-matroska': '.mkv',
'application/octet-stream': '.mkv',
'video/avi': '.avi'
}) })
} }