Merge branch 'release/v8.1.x' into develop

Author: Chocobozzz

packages/tests/src/api/check-params/video-studio.ts

@@ -249,14 +249,18 @@ describe('Test video studio API validator', function () {
         await cut(2, 2)
       })
 
-      it('Should fail with inconsistents start/end', async function () {
+      it('Should fail with inconsistent start/end', async function () {
         await cut(2, 1)
       })
 
       it('Should fail without start and end', async function () {
         await cut(undefined, undefined)
       })
 
+      it('Should fail with a bad end', async function () {
+        await cut(undefined, 0)
+      })
+
       it('Should succeed with the correct params', async function () {
         this.timeout(360000)
 

server/core/helpers/custom-validators/video-studio.ts

@@ -6,48 +6,54 @@ import { isArray } from './misc.js'
 import { isVideoFileMimeTypeValid, isVideoImageValid } from './videos.js'
 import { forceNumber } from '@peertube/peertube-core-utils'
 
-function isValidStudioTasksArray (tasks: any) {
+export function isValidStudioTasksArray (tasks: any) {
   if (!isArray(tasks)) return false
 
   return tasks.length >= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.min &&
     tasks.length <= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.max
 }
 
-function isStudioCutTaskValid (task: VideoStudioTask) {
+export function isStudioCutTaskValid (options: {
+  task: VideoStudioTask
+}) {
+  const { task } = options
+
   if (task.name !== 'cut') return false
   if (!task.options) return false
 
   const { start, end } = task.options
   if (!start && !end) return false
 
-  if (start && !validator.default.isInt(start + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false
-  if (end && !validator.default.isInt(end + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false
+  if (start && !validator.default.isInt(start + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME_START)) return false
+  if (end && !validator.default.isInt(end + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME_END)) return false
 
   if (!start || !end) return true
 
   return forceNumber(start) < forceNumber(end)
 }
 
-function isStudioTaskAddIntroOutroValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) {
+export function isStudioTaskAddIntroOutroValid (options: {
+  task: VideoStudioTask
+  indice: number
+  files: Express.Multer.File[]
+}) {
+  const { task, indice, files } = options
+
   const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file'))
 
   return (task.name === 'add-intro' || task.name === 'add-outro') &&
     file && isVideoFileMimeTypeValid([ file ], null)
 }
 
-function isStudioTaskAddWatermarkValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) {
+export function isStudioTaskAddWatermarkValid (options: {
+  task: VideoStudioTask
+  indice: number
+  files: Express.Multer.File[]
+}) {
+  const { task, indice, files } = options
+
   const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file'))
 
   return task.name === 'add-watermark' &&
     file && isVideoImageValid([ file ], null, true)
 }
-
-// ---------------------------------------------------------------------------
-
-export {
-  isValidStudioTasksArray,
-
-  isStudioCutTaskValid,
-  isStudioTaskAddIntroOutroValid,
-  isStudioTaskAddWatermarkValid
-}

server/core/initializers/constants.ts

@@ -516,7 +516,8 @@ export const CONSTRAINTS_FIELDS = {
   },
   VIDEO_STUDIO: {
     TASKS: { min: 1, max: 10 }, // Number of tasks
-    CUT_TIME: { min: 0 } // Value
+    CUT_TIME_START: { min: 0 }, // Value
+    CUT_TIME_END: { min: 1 } // Value
   },
   LOGS: {
     CLIENT_MESSAGE: { min: 1, max: 1000 }, // Length

server/core/lib/job-queue/handlers/video-studio-edition.ts

@@ -13,6 +13,7 @@ import {
 import { buildUUID } from '@peertube/peertube-node-utils'
 import { getFFmpegCommandWrapperOptions } from '@server/helpers/ffmpeg/index.js'
 import { CONFIG } from '@server/initializers/config.js'
+import { sequelizeTypescript } from '@server/initializers/database.js'
 import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/default-transcoding-profiles.js'
 import { isUserQuotaValid } from '@server/lib/user.js'
 import { VideoPathManager } from '@server/lib/video-path-manager.js'
@@ -94,8 +95,12 @@ async function processVideoStudioEdition (job: Job) {
     await safeCleanupStudioTMPFiles(payload.tasks)
 
     try {
-      const video = await VideoModel.loadFull(payload.videoUUID)
-      await video.setNewState(VideoState.PUBLISHED, false, undefined)
+      await sequelizeTypescript.transaction(async transaction => {
+        const video = await VideoModel.load(payload.videoUUID, transaction)
+        if (!video || video.state === VideoState.PUBLISHED) return
+
+        await video.setNewState(VideoState.PUBLISHED, false, transaction)
+      })
     } catch (err) {
       logger.error('Cannot reset video state after studio error', { err, ...lTags })
     }

server/core/lib/move-storage/move-to-object-storage.ts

@@ -55,7 +55,7 @@ export async function moveVideoToObjectStorage (options: {
     await moveToNextState({ video: { uuid: videoUUID }, ...moveVideoState })
   } else {
     const videoFull = await VideoModel.loadFull(videoUUID)
-    await federateVideoIfNeeded(videoFull, false, undefined)
+    if (videoFull) await federateVideoIfNeeded(videoFull, false, undefined)
   }
 }
 

server/core/lib/runners/job-handlers/shared/utils.ts

@@ -9,6 +9,7 @@ import { onWebVideoFileTranscoding } from '@server/lib/transcoding/web-transcodi
 import { VideoModel } from '@server/models/video/video.js'
 import { MVideoFull } from '@server/types/models/index.js'
 import { MRunnerJob } from '@server/types/models/runners/index.js'
+import { Transaction } from 'sequelize'
 
 export async function onVODWebVideoOrAudioMergeTranscodingJob (options: {
   video: MVideoFull
@@ -27,10 +28,10 @@ export async function onVODWebVideoOrAudioMergeTranscodingJob (options: {
   await onTranscodingEnded({ isNewVideo: privatePayload.isNewVideo, moveVideoToNextState: privatePayload.canMoveVideoState, video })
 }
 
-export async function loadRunnerVideo (runnerJob: MRunnerJob, lTags: LoggerTagsFn) {
+export async function loadRunnerVideo (runnerJob: MRunnerJob, lTags: LoggerTagsFn, transaction?: Transaction) {
   const videoUUID = runnerJob.privatePayload.videoUUID
 
-  const video = await VideoModel.loadFull(videoUUID)
+  const video = await VideoModel.loadFull(videoUUID, transaction)
   if (!video) {
     logger.info('Video %s does not exist anymore after runner job.', videoUUID, lTags(videoUUID))
     return undefined

server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts

@@ -24,16 +24,18 @@ import {
 } from '../runner-urls.js'
 import { AbstractJobHandler } from './abstract-job-handler.js'
 import { loadRunnerVideo } from './shared/utils.js'
+import { sequelizeTypescript } from '@server/initializers/database.js'
 
 type CreateOptions = {
   video: MVideoWithFile
   tasks: VideoStudioTaskPayload[]
   priority: number
 }
 
-// dprint-ignore
 // eslint-disable-next-line max-len
-export class VideoStudioTranscodingJobHandler extends AbstractJobHandler<CreateOptions, RunnerJobUpdatePayload, VideoStudioTranscodingSuccess> {
+export class VideoStudioTranscodingJobHandler
+  extends AbstractJobHandler<CreateOptions, RunnerJobUpdatePayload, VideoStudioTranscodingSuccess>
+{
   async create (options: CreateOptions) {
     const { video, priority, tasks } = options
 
@@ -161,9 +163,11 @@ export class VideoStudioTranscodingJobHandler extends AbstractJobHandler<CreateO
     const payload = runnerJob.privatePayload as RunnerJobVideoStudioTranscodingPrivatePayload
     await safeCleanupStudioTMPFiles(payload.originalTasks)
 
-    const video = await loadRunnerVideo(options.runnerJob, this.lTags)
-    if (!video) return
+    await sequelizeTypescript.transaction(async transaction => {
+      const video = await loadRunnerVideo(options.runnerJob, this.lTags, transaction)
+      if (!video || video.state === VideoState.PUBLISHED) return
 
-    return video.setNewState(VideoState.PUBLISHED, false, undefined)
+      await video.setNewState(VideoState.PUBLISHED, false, transaction)
+    })
   }
 }

server/core/middlewares/validators/videos/video-studio.ts

@@ -26,7 +26,7 @@ const videoStudioAddEditionValidator = [
     if (CONFIG.VIDEO_STUDIO.ENABLED !== true) {
       res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'Video studio is disabled on this instance'
+        message: req.t('Video studio is disabled on this instance')
       })
 
       return cleanUpReqFiles(req)
@@ -47,7 +47,7 @@ const videoStudioAddEditionValidator = [
       if (!checkTask(req, task, i)) {
         res.fail({
           status: HttpStatusCode.BAD_REQUEST_400,
-          message: `Task ${task.name} is invalid`
+          message: req.t('Task {taskName} is invalid', { taskName: task.name })
         })
 
         return cleanUpReqFiles(req)
@@ -57,7 +57,7 @@ const videoStudioAddEditionValidator = [
         if (task.name === 'add-intro' || task.name === 'add-outro' || task.name === 'add-watermark') {
           res.fail({
             status: HttpStatusCode.BAD_REQUEST_400,
-            message: `Task ${task.name} is invalid: video does not contain a video stream`
+            message: req.t('Task {taskName} is invalid: video does not contain a video stream', { taskName: task.name })
           })
 
           return cleanUpReqFiles(req)
@@ -71,7 +71,7 @@ const videoStudioAddEditionValidator = [
         if (await isAudioFile(filePath)) {
           res.fail({
             status: HttpStatusCode.BAD_REQUEST_400,
-            message: `Task ${task.name} is invalid: input file does not contain a video stream`
+            message: req.t('Task {taskName} is invalid: input file does not contain a video stream', { taskName: task.name })
           })
 
           return cleanUpReqFiles(req)
@@ -104,7 +104,7 @@ export {
 // ---------------------------------------------------------------------------
 
 const taskCheckers: {
-  [id in VideoStudioTask['name']]: (task: VideoStudioTask, indice?: number, files?: Express.Multer.File[]) => boolean
+  [id in VideoStudioTask['name']]: (options: { task: VideoStudioTask, indice?: number, files?: Express.Multer.File[] }) => boolean
 } = {
   'cut': isStudioCutTaskValid,
   'add-intro': isStudioTaskAddIntroOutroValid,
@@ -116,5 +116,5 @@ function checkTask (req: express.Request, task: VideoStudioTask, indice?: number
   const checker = taskCheckers[task.name]
   if (!checker) return false
 
-  return checker(task, indice, req.files as Express.Multer.File[])
+  return checker({ task, indice, files: req.files as Express.Multer.File[] })
 }