diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-05 13:41:48 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2023-05-09 08:57:34 +0200 |
commit | a687879e94fa5d3ecdd76bec3d94d0e1698ee913 (patch) | |
tree | b17ee096918dfd4624d50dbf0e91ff8f66bd4a7f /server/lib/transcoding | |
parent | e7d8e2b245491c0a8e008fb570037506d729ff04 (diff) | |
download | PeerTube-a687879e94fa5d3ecdd76bec3d94d0e1698ee913.tar.gz PeerTube-a687879e94fa5d3ecdd76bec3d94d0e1698ee913.tar.zst PeerTube-a687879e94fa5d3ecdd76bec3d94d0e1698ee913.zip |
Reload the video after waiting for the files lock
Diffstat (limited to 'server/lib/transcoding')
3 files changed, 6 insertions, 1 deletions
diff --git a/server/lib/transcoding/hls-transcoding.ts b/server/lib/transcoding/hls-transcoding.ts index cffa859c7..2c325d9ee 100644 --- a/server/lib/transcoding/hls-transcoding.ts +++ b/server/lib/transcoding/hls-transcoding.ts | |||
@@ -72,7 +72,6 @@ export async function onHLSVideoFileTranscoding (options: { | |||
72 | const mutexReleaser = await VideoPathManager.Instance.lockFiles(video.uuid) | 72 | const mutexReleaser = await VideoPathManager.Instance.lockFiles(video.uuid) |
73 | 73 | ||
74 | try { | 74 | try { |
75 | // VOD transcoding is a long task, refresh video attributes | ||
76 | await video.reload() | 75 | await video.reload() |
77 | 76 | ||
78 | const videoFilePath = VideoPathManager.Instance.getFSVideoFileOutputPath(playlist, videoFile) | 77 | const videoFilePath = VideoPathManager.Instance.getFSVideoFileOutputPath(playlist, videoFile) |
diff --git a/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts b/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts index 29ee2ca61..fa2ac70bf 100644 --- a/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts +++ b/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts | |||
@@ -40,6 +40,9 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder { | |||
40 | : await VideoPathManager.Instance.lockFiles(video.uuid) | 40 | : await VideoPathManager.Instance.lockFiles(video.uuid) |
41 | 41 | ||
42 | try { | 42 | try { |
43 | await video.reload() | ||
44 | await videoFile.reload() | ||
45 | |||
43 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), async videoFilePath => { | 46 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), async videoFilePath => { |
44 | const probe = await ffprobePromise(videoFilePath) | 47 | const probe = await ffprobePromise(videoFilePath) |
45 | 48 | ||
diff --git a/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts b/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts index 90b035402..4b8bc2f3d 100644 --- a/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts +++ b/server/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts | |||
@@ -36,6 +36,9 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder { | |||
36 | : await VideoPathManager.Instance.lockFiles(video.uuid) | 36 | : await VideoPathManager.Instance.lockFiles(video.uuid) |
37 | 37 | ||
38 | try { | 38 | try { |
39 | await video.reload() | ||
40 | await videoFile.reload() | ||
41 | |||
39 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), async videoFilePath => { | 42 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), async videoFilePath => { |
40 | const probe = await ffprobePromise(videoFilePath) | 43 | const probe = await ffprobePromise(videoFilePath) |
41 | 44 | ||