Prevent HLS transcoding after webtorrent transcoding

2 files changed, 9 insertions, 4 deletions

diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts
index 02902b0b8..5540b791d 100644
--- a/server/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/lib/job-queue/handlers/video-transcoding.ts
@@ -10,7 +10,7 @@ import { pick } from '@shared/core-utils'
 import {
   HLSTranscodingPayload,
   MergeAudioTranscodingPayload,
-  NewResolutionTranscodingPayload,
+  NewWebTorrentResolutionTranscodingPayload,
   OptimizeTranscodingPayload,
   VideoResolution,
   VideoTranscodingPayload
@@ -110,7 +110,7 @@ async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, video: MV
 
 async function handleNewWebTorrentResolutionJob (
   job: Job,
-  payload: NewResolutionTranscodingPayload,
+  payload: NewWebTorrentResolutionTranscodingPayload,
   video: MVideoFullLight,
   user: MUserId
 ) {
@@ -217,9 +217,12 @@ async function onVideoFirstWebTorrentTranscoding (
 async function onNewWebTorrentFileResolution (
   video: MVideo,
   user: MUserId,
-  payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
+  payload: NewWebTorrentResolutionTranscodingPayload | MergeAudioTranscodingPayload
 ) {
-  await createHlsJobIfEnabled(user, { hasAudio: true, copyCodecs: true, isMaxQuality: false, ...payload })
+  if (payload.createHLSIfNeeded) {
+    await createHlsJobIfEnabled(user, { hasAudio: true, copyCodecs: true, isMaxQuality: false, ...payload })
+  }
+
   await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
 
   await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
@@ -282,6 +285,7 @@ async function createLowerResolutionsJobs (options: {
         resolution,
         isPortraitMode,
         hasAudio,
+        createHLSIfNeeded: true,
         isNewVideo
       }
 
diff --git a/server/lib/video.ts b/server/lib/video.ts
index e5af028ea..2690f953d 100644
--- a/server/lib/video.ts
+++ b/server/lib/video.ts
@@ -89,6 +89,7 @@ async function addOptimizeOrMergeAudioJob (video: MVideoUUID, videoFile: MVideoF
       type: 'merge-audio-to-webtorrent',
       resolution: DEFAULT_AUDIO_RESOLUTION,
       videoUUID: video.uuid,
+      createHLSIfNeeded: true,
       isNewVideo: true
     }
   } else {