-import * as express from 'express'
-import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares'
-import { addVideoCaptionValidator, deleteVideoCaptionValidator, listVideoCaptionsValidator } from '../../../middlewares/validators'
+import express from 'express'
+import { MVideoCaption } from '@server/types/models'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
+import { moveAndProcessCaptionFile } from '../../../helpers/captions-utils'
import { createReqFiles } from '../../../helpers/express-utils'
-import { MIMETYPES } from '../../../initializers/constants'
-import { getFormattedObjects } from '../../../helpers/utils'
-import { VideoCaptionModel } from '../../../models/video/video-caption'
import { logger } from '../../../helpers/logger'
-import { federateVideoIfNeeded } from '../../../lib/activitypub/videos'
-import { moveAndProcessCaptionFile } from '../../../helpers/captions-utils'
+import { getFormattedObjects } from '../../../helpers/utils'
import { CONFIG } from '../../../initializers/config'
+import { MIMETYPES } from '../../../initializers/constants'
import { sequelizeTypescript } from '../../../initializers/database'
-import { MVideoCaptionVideo } from '@server/types/models'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { federateVideoIfNeeded } from '../../../lib/activitypub/videos'
+import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares'
+import { addVideoCaptionValidator, deleteVideoCaptionValidator, listVideoCaptionsValidator } from '../../../middlewares/validators'
+import { VideoCaptionModel } from '../../../models/video/video-caption'
const reqVideoCaptionAdd = createReqFiles(
[ 'captionfile' ],
const videoCaptionPhysicalFile = req.files['captionfile'][0]
const video = res.locals.videoAll
+ const captionLanguage = req.params.captionLanguage
+
const videoCaption = new VideoCaptionModel({
videoId: video.id,
- language: req.params.captionLanguage
- }) as MVideoCaptionVideo
- videoCaption.Video = video
+ filename: VideoCaptionModel.generateCaptionName(captionLanguage),
+ language: captionLanguage
+ }) as MVideoCaption
// Move physical file
await moveAndProcessCaptionFile(videoCaptionPhysicalFile, videoCaption)
await sequelizeTypescript.transaction(async t => {
- await VideoCaptionModel.insertOrReplaceLanguage(video.id, req.params.captionLanguage, null, t)
+ await VideoCaptionModel.insertOrReplaceLanguage(videoCaption, t)
// Update video update
await federateVideoIfNeeded(video, false, t)