-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, sequelizeTypescript } from '../../../initializers'
-import { getFormattedObjects } from '../../../helpers/utils'
-import { VideoCaptionModel } from '../../../models/video/video-caption'
import { logger } from '../../../helpers/logger'
-import { federateVideoIfNeeded } from '../../../lib/activitypub'
-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 { 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' ],
// ---------------------------------------------------------------------------
async function listVideoCaptions (req: express.Request, res: express.Response) {
- const data = await VideoCaptionModel.listVideoCaptions(res.locals.video.id)
+ const data = await VideoCaptionModel.listVideoCaptions(res.locals.videoId.id)
return res.json(getFormattedObjects(data, data.length))
}
async function addVideoCaption (req: express.Request, res: express.Response) {
const videoCaptionPhysicalFile = req.files['captionfile'][0]
- const video = res.locals.video
+ const video = res.locals.videoAll
+
+ const captionLanguage = req.params.captionLanguage
const videoCaption = new VideoCaptionModel({
videoId: video.id,
- language: req.params.captionLanguage
- })
- 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, t)
+ await VideoCaptionModel.insertOrReplaceLanguage(videoCaption, t)
// Update video update
await federateVideoIfNeeded(video, false, t)
})
- return res.status(204).end()
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function deleteVideoCaption (req: express.Request, res: express.Response) {
- const video = res.locals.video
+ const video = res.locals.videoAll
const videoCaption = res.locals.videoCaption
await sequelizeTypescript.transaction(async t => {
logger.info('Video caption %s of video %s deleted.', videoCaption.language, video.uuid)
- return res.type('json').status(204).end()
+ return res.type('json').status(HttpStatusCode.NO_CONTENT_204).end()
}