Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Don't check video state on force transcoding

Chocobozzz1d95916a9982
diff --git a/server/core/middlewares/validators/videos/shared/video-validators.ts b/server/core/middlewares/validators/videos/shared/video-validators.ts
index f41c4b01a4..80c9fd363e 100644
--- a/server/core/middlewares/validators/videos/shared/video-validators.ts
+++ b/server/core/middlewares/validators/videos/shared/video-validators.ts
@@ -102,7 +102,16 @@ export function checkVideoFileCanBeEdited (video: MVideo, req: express.Request,
return true
}
-export function checkVideoCanBeTranscribed (video: MVideo, req: express.Request, res: express.Response) {
+export function checkVideoCanBeTranscribedOrTranscoded (options: {
+ video: MVideo
+ req: express.Request
+ res: express.Response
+
+ // Default false
+ skipStateCheck?: boolean
+}) {
+ const { video, req, res, skipStateCheck = false } = options
+
if (video.remote) {
res.fail({
status: HttpStatusCode.BAD_REQUEST_400,
@@ -119,6 +128,8 @@ export function checkVideoCanBeTranscribed (video: MVideo, req: express.Request,
return false
}
+ if (skipStateCheck) return true
+
const incompatibleStates = new Set<VideoStateType>([
VideoState.TO_IMPORT,
VideoState.TO_EDIT,
diff --git a/server/core/middlewares/validators/videos/video-captions.ts b/server/core/middlewares/validators/videos/video-captions.ts
index 11206aa45d..2663a011fd 100644
--- a/server/core/middlewares/validators/videos/video-captions.ts
+++ b/server/core/middlewares/validators/videos/video-captions.ts
@@ -17,7 +17,7 @@ import {
isValidVideoIdParam,
isValidVideoPasswordHeader
} from '../shared/index.js'
-import { checkVideoCanBeTranscribed } from './shared/video-validators.js'
+import { checkVideoCanBeTranscribedOrTranscoded } from './shared/video-validators.js'
export const addVideoCaptionValidator = [
isValidVideoIdParam('videoId'),
@@ -80,7 +80,7 @@ export const generateVideoCaptionValidator = [
const video = res.locals.videoAll
- if (!checkVideoCanBeTranscribed(video, req, res)) return
+ if (!checkVideoCanBeTranscribedOrTranscoded({ video, req, res })) return
// Check if the user who did the request is able to update the video
const user = res.locals.oauth.token.User
diff --git a/server/core/middlewares/validators/videos/video-transcoding.ts b/server/core/middlewares/validators/videos/video-transcoding.ts
index 9b8263c469..b9fbd222db 100644
--- a/server/core/middlewares/validators/videos/video-transcoding.ts
+++ b/server/core/middlewares/validators/videos/video-transcoding.ts
@@ -6,7 +6,7 @@ import { VideoJobInfoModel } from '@server/models/video/video-job-info.js'
import express from 'express'
import { body } from 'express-validator'
import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from '../shared/index.js'
-import { checkVideoCanBeTranscribed } from './shared/video-validators.js'
+import { checkVideoCanBeTranscribedOrTranscoded } from './shared/video-validators.js'
const createTranscodingValidator = [
isValidVideoIdParam('videoId'),
@@ -24,17 +24,17 @@ const createTranscodingValidator = [
if (!await doesVideoExist(req.params.videoId, res, 'all')) return
const video = res.locals.videoAll
+ const body = req.body as VideoTranscodingCreate
- if (!checkVideoCanBeTranscribed(video, req, res)) return
+ if (!checkVideoCanBeTranscribedOrTranscoded({ video, req, res, skipStateCheck: body.forceTranscoding === true })) return
if (CONFIG.TRANSCODING.ENABLED !== true) {
return res.fail({
status: HttpStatusCode.BAD_REQUEST_400,
- message: 'Cannot run transcoding job because transcoding is disabled on this instance'
+ message: req.t('Cannot run transcoding job because transcoding is disabled on this instance')
})
}
- const body = req.body as VideoTranscodingCreate
if (body.forceTranscoding === true) return next()
const info = await VideoJobInfoModel.load(video.id)
@@ -42,7 +42,7 @@ const createTranscodingValidator = [
return res.fail({
status: HttpStatusCode.CONFLICT_409,
type: ServerErrorCode.VIDEO_ALREADY_BEING_TRANSCODED,
- message: 'This video is already being transcoded'
+ message: req.t('This video is already being transcoded')
})
}