ActivityPub-federated video streaming platform using P2P directly in your web browser
Lock video before moving files
Chocobozzz0e394bd38520
diff --git a/server/core/lib/video-studio.ts b/server/core/lib/video-studio.tsindex 0adbf1b5b6..6321bae8d3 100644--- a/server/core/lib/video-studio.ts+++ b/server/core/lib/video-studio.ts@@ -2,8 +2,9 @@ import { buildAspectRatio } from '@peertube/peertube-core-utils'import { getVideoStreamDuration } from '@peertube/peertube-ffmpeg'import { VideoStudioEditionPayload, VideoStudioTask, VideoStudioTaskPayload } from '@peertube/peertube-models'import { logger, loggerTagsFactory } from '@server/helpers/logger.js'-import { createTorrentAndSetInfoHashFromPath } from '@server/lib/webtorrent.js'import { CONFIG } from '@server/initializers/config.js'+import { createTorrentAndSetInfoHashFromPath } from '@server/lib/webtorrent.js'+import { VideoModel } from '@server/models/video/video.js'import { MUser, MVideoFile, MVideoFullLight, MVideoWithAllFiles, MVideoWithFile } from '@server/types/models/index.js'import { move, remove } from 'fs-extra/esm'import { join } from 'path'@@ -90,47 +91,56 @@ export async function onVideoStudioEnded (options: {tasks: VideoStudioTaskPayload[]video: MVideoFullLight}) {- const { video, tasks, editionResultPath } = options+ const { tasks, editionResultPath } = optionsconst newFile = await buildNewFile({ path: editionResultPath, mode: 'web-video' })- newFile.videoId = video.id- const outputPath = VideoPathManager.Instance.getFSVideoFileOutputPath(video, newFile)- await move(editionResultPath, outputPath)+ const videoFileMutexReleaser = await VideoPathManager.Instance.lockFiles(options.video.uuid)- await safeCleanupStudioTMPFiles(tasks)+ try {+ const video = await VideoModel.loadFull(options.video.uuid)+ newFile.videoId = video.id- await createTorrentAndSetInfoHashFromPath(video, newFile, outputPath)- await removeAllFiles(video, newFile)+ const outputPath = VideoPathManager.Instance.getFSVideoFileOutputPath(video, newFile)+ await move(editionResultPath, outputPath)+ videoFileMutexReleaser()- await newFile.save()+ await safeCleanupStudioTMPFiles(tasks)- video.duration = await getVideoStreamDuration(outputPath)- video.aspectRatio = buildAspectRatio({ width: newFile.width, height: newFile.height })- await video.save()+ await createTorrentAndSetInfoHashFromPath(video, newFile, outputPath)+ await removeAllFiles(video, newFile)- await JobQueue.Instance.createSequentialJobFlow(- await buildLocalStoryboardJobIfNeeded({ video, federate: false }),- {- type: 'federate-video' as 'federate-video',- payload: {- videoUUID: video.uuid,- isNewVideoForFederation: false- }- },- {- type: 'transcoding-job-builder' as 'transcoding-job-builder',- payload: {- videoUUID: video.uuid,- optimizeJob: {- isNewVideo: false+ await newFile.save()++ video.duration = await getVideoStreamDuration(outputPath)+ video.aspectRatio = buildAspectRatio({ width: newFile.width, height: newFile.height })+ await video.save()++ await JobQueue.Instance.createSequentialJobFlow(+ await buildLocalStoryboardJobIfNeeded({ video, federate: false }),+ {+ type: 'federate-video' as 'federate-video',+ payload: {+ videoUUID: video.uuid,+ isNewVideoForFederation: false+ }+ },+ {+ type: 'transcoding-job-builder' as 'transcoding-job-builder',+ payload: {+ videoUUID: video.uuid,+ optimizeJob: {+ isNewVideo: false+ }}}- }- )+ )- await addRemoteStoryboardJobIfNeeded(video)- await regenerateTranscriptionTaskIfNeeded(video)+ await addRemoteStoryboardJobIfNeeded(video)+ await regenerateTranscriptionTaskIfNeeded(video)+ } finally {+ videoFileMutexReleaser()+ }}// ---------------------------------------------------------------------------