diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-04 15:55:51 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2023-05-09 08:57:34 +0200 |
commit | ab14f0e0dca878dbaccc8f6a895a68e4269c9873 (patch) | |
tree | 078247f8620ee1f3260b8c3e3336059863273eb8 /server/controllers | |
parent | 5e47f6ab984a7d00782e4c7030afffa1ba480add (diff) | |
download | PeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.tar.gz PeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.tar.zst PeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.zip |
Prefer video studio instead of video edition
Clearer and easier to find in the project
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/api/runners/jobs-files.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/runners/jobs.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/controllers/api/runners/jobs-files.ts b/server/controllers/api/runners/jobs-files.ts index 4efa40b3a..260d824a8 100644 --- a/server/controllers/api/runners/jobs-files.ts +++ b/server/controllers/api/runners/jobs-files.ts | |||
@@ -31,7 +31,7 @@ runnerJobFilesRouter.post('/jobs/:jobUUID/files/videos/:videoId/studio/task-file | |||
31 | asyncMiddleware(jobOfRunnerGetValidator), | 31 | asyncMiddleware(jobOfRunnerGetValidator), |
32 | asyncMiddleware(runnerJobGetVideoTranscodingFileValidator), | 32 | asyncMiddleware(runnerJobGetVideoTranscodingFileValidator), |
33 | runnerJobGetVideoStudioTaskFileValidator, | 33 | runnerJobGetVideoStudioTaskFileValidator, |
34 | getVideoEditionTaskFile | 34 | getVideoStudioTaskFile |
35 | ) | 35 | ) |
36 | 36 | ||
37 | // --------------------------------------------------------------------------- | 37 | // --------------------------------------------------------------------------- |
@@ -94,14 +94,14 @@ function getMaxQualityVideoPreview (req: express.Request, res: express.Response) | |||
94 | return res.sendFile(file.getPath()) | 94 | return res.sendFile(file.getPath()) |
95 | } | 95 | } |
96 | 96 | ||
97 | function getVideoEditionTaskFile (req: express.Request, res: express.Response) { | 97 | function getVideoStudioTaskFile (req: express.Request, res: express.Response) { |
98 | const runnerJob = res.locals.runnerJob | 98 | const runnerJob = res.locals.runnerJob |
99 | const runner = runnerJob.Runner | 99 | const runner = runnerJob.Runner |
100 | const video = res.locals.videoAll | 100 | const video = res.locals.videoAll |
101 | const filename = req.params.filename | 101 | const filename = req.params.filename |
102 | 102 | ||
103 | logger.info( | 103 | logger.info( |
104 | 'Get video edition task file %s of video %s of job %s for runner %s', filename, video.uuid, runnerJob.uuid, runner.name, | 104 | 'Get video studio task file %s of video %s of job %s for runner %s', filename, video.uuid, runnerJob.uuid, runner.name, |
105 | lTags(runner.name, runnerJob.id, runnerJob.type) | 105 | lTags(runner.name, runnerJob.id, runnerJob.type) |
106 | ) | 106 | ) |
107 | 107 | ||
diff --git a/server/controllers/api/runners/jobs.ts b/server/controllers/api/runners/jobs.ts index 8e34c07a3..3f2a92182 100644 --- a/server/controllers/api/runners/jobs.ts +++ b/server/controllers/api/runners/jobs.ts | |||
@@ -42,7 +42,7 @@ import { | |||
42 | RunnerJobUpdateBody, | 42 | RunnerJobUpdateBody, |
43 | RunnerJobUpdatePayload, | 43 | RunnerJobUpdatePayload, |
44 | UserRight, | 44 | UserRight, |
45 | VideoEditionTranscodingSuccess, | 45 | VideoStudioTranscodingSuccess, |
46 | VODAudioMergeTranscodingSuccess, | 46 | VODAudioMergeTranscodingSuccess, |
47 | VODHLSTranscodingSuccess, | 47 | VODHLSTranscodingSuccess, |
48 | VODWebVideoTranscodingSuccess | 48 | VODWebVideoTranscodingSuccess |
@@ -300,7 +300,7 @@ const jobSuccessPayloadBuilders: { | |||
300 | } | 300 | } |
301 | }, | 301 | }, |
302 | 302 | ||
303 | 'video-edition-transcoding': (payload: VideoEditionTranscodingSuccess, files) => { | 303 | 'video-studio-transcoding': (payload: VideoStudioTranscodingSuccess, files) => { |
304 | return { | 304 | return { |
305 | ...payload, | 305 | ...payload, |
306 | 306 | ||