Skip to content

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

Fix web video deletion

Chocobozzz97418f3aa86c
diff --git a/server/core/lib/job-queue/handlers/video-transcoding.ts b/server/core/lib/job-queue/handlers/video-transcoding.ts
index 8833e1d409..9ab7143a8f 100644
--- a/server/core/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/core/lib/job-queue/handlers/video-transcoding.ts
@@ -5,7 +5,7 @@ import {
OptimizeTranscodingPayload,
VideoTranscodingPayload
} from '@peertube/peertube-models'
-import { isVideoMissHLSAudio } from '@server/lib/runners/job-handlers/shared/utils.js'
+import { isHLSAudioMissing } from '@server/lib/runners/job-handlers/shared/utils.js'
import { onTranscodingEnded } from '@server/lib/transcoding/ended-transcoding.js'
import { generateHlsPlaylistResolution } from '@server/lib/transcoding/hls-transcoding.js'
import { mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewWebVideoResolution } from '@server/lib/transcoding/web-transcoding.js'
@@ -145,18 +145,22 @@ async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, videoArg:
logger.info('HLS transcoding job for %s ended.', video.uuid, lTags(video.uuid), { payload })
- if (payload.deleteWebVideoFiles === true) {
+ const missingAudio = await isHLSAudioMissing({
+ resolution: payload.resolution,
+ separatedAudio: payload.separatedAudio,
+ videoId: videoArg.uuid
+ })
+
+ if (!missingAudio && payload.deleteWebVideoFiles === true) {
logger.info('Removing Web Video files of %s now we have a HLS version of it.', video.uuid, lTags(video.uuid))
await removeAllWebVideoFiles(video)
}
- let moveVideoToNextState = !payload.hasChildren
-
// Splitted audio, wait audio generation before moving the video in its next state
- if (await isVideoMissHLSAudio({ resolution: payload.resolution, separatedAudio: payload.separatedAudio, videoId: videoArg.uuid })) {
- moveVideoToNextState = false
- }
+ const moveVideoToNextState = missingAudio
+ ? false
+ : !payload.hasChildren
await onTranscodingEnded({ isNewVideo: payload.isNewVideo, moveVideoToNextState, video })
}
diff --git a/server/core/lib/runners/job-handlers/shared/utils.ts b/server/core/lib/runners/job-handlers/shared/utils.ts
index 7b38a4d85e..fa2bdfd7cc 100644
--- a/server/core/lib/runners/job-handlers/shared/utils.ts
+++ b/server/core/lib/runners/job-handlers/shared/utils.ts
@@ -39,7 +39,7 @@ export async function loadRunnerVideo (runnerJob: MRunnerJob, lTags: LoggerTagsF
return video
}
-export async function isVideoMissHLSAudio (options: {
+export async function isHLSAudioMissing (options: {
resolution: number
separatedAudio: boolean
videoId: string | number
diff --git a/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
index b54ade6233..6ac3c67f0f 100644
--- a/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
@@ -15,7 +15,7 @@ import { MVideoWithFile } from '@server/types/models/index.js'
import { MRunnerJob } from '@server/types/models/runners/index.js'
import { generateRunnerTranscodingAudioInputFileUrl, generateRunnerTranscodingVideoInputFileUrl } from '../runner-urls.js'
import { AbstractVODTranscodingJobHandler } from './abstract-vod-transcoding-job-handler.js'
-import { isVideoMissHLSAudio, loadRunnerVideo } from './shared/utils.js'
+import { isHLSAudioMissing, loadRunnerVideo } from './shared/utils.js'
type CreateOptions = {
video: MVideoWithFile
@@ -29,8 +29,9 @@ type CreateOptions = {
}
// eslint-disable-next-line max-len
-export class VODHLSTranscodingJobHandler extends AbstractVODTranscodingJobHandler<CreateOptions, RunnerJobUpdatePayload, VODHLSTranscodingSuccess> {
-
+export class VODHLSTranscodingJobHandler
+ extends AbstractVODTranscodingJobHandler<CreateOptions, RunnerJobUpdatePayload, VODHLSTranscodingSuccess>
+{
async create (options: CreateOptions) {
const { video, resolution, fps, dependsOnRunnerJob, separatedAudio, priority } = options
@@ -96,15 +97,15 @@ export class VODHLSTranscodingJobHandler extends AbstractVODTranscodingJobHandle
})
// Splitted audio? Wait audio generation before moving the video in its next state
- const moveVideoToNextState = !await isVideoMissHLSAudio({
+ const missingAudio = await isHLSAudioMissing({
resolution: payload.output.resolution,
separatedAudio: payload.output.separatedAudio,
videoId: video.uuid
})
- await onTranscodingEnded({ isNewVideo: privatePayload.isNewVideo, moveVideoToNextState, video })
+ await onTranscodingEnded({ isNewVideo: privatePayload.isNewVideo, moveVideoToNextState: !missingAudio, video })
- if (privatePayload.deleteWebVideoFiles === true) {
+ if (!missingAudio && privatePayload.deleteWebVideoFiles === true) {
logger.info('Removing web video files of %s now we have a HLS version of it.', video.uuid, this.lTags(video.uuid))
await removeAllWebVideoFiles(video)
diff --git a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
index 875123f3d3..90d19c005b 100644
--- a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
+++ b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
@@ -77,7 +77,7 @@ export abstract class AbstractJobBuilder<P> {
hlsPayloads.push(
this.buildHLSJobPayload({
- deleteWebVideoFiles: !CONFIG.TRANSCODING.WEB_VIDEOS.ENABLED && !hasSplitAudioTranscoding,
+ deleteWebVideoFiles: !CONFIG.TRANSCODING.WEB_VIDEOS.ENABLED,
separatedAudio: hasSplitAudioTranscoding,
@@ -98,7 +98,7 @@ export abstract class AbstractJobBuilder<P> {
higherPriority: true,
...this.buildHLSJobPayload({
- deleteWebVideoFiles: !CONFIG.TRANSCODING.WEB_VIDEOS.ENABLED,
+ deleteWebVideoFiles: false,
separatedAudio: hasSplitAudioTranscoding,
copyCodecs: true,