From 64fd6158fd276f258bcfc4bb0c8fc2f64a220a11 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 5 Aug 2022 13:40:56 +0200 Subject: [PATCH] Fix resolution to transcode hook name --- server/controllers/api/videos/transcoding.ts | 2 +- server/lib/job-queue/handlers/video-transcoding.ts | 2 +- server/lib/live/live-manager.ts | 2 +- server/tests/fixtures/peertube-plugin-test/main.js | 2 +- server/tests/plugins/filter-hooks.ts | 2 +- shared/models/plugins/server/server-hook.model.ts | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/controllers/api/videos/transcoding.ts b/server/controllers/api/videos/transcoding.ts index 09ab7dc0f..7d924c5ac 100644 --- a/server/controllers/api/videos/transcoding.ts +++ b/server/controllers/api/videos/transcoding.ts @@ -33,7 +33,7 @@ async function createTranscoding (req: express.Request, res: express.Response) { const { resolution: maxResolution, audioStream } = await video.probeMaxQualityFile() const resolutions = await Hooks.wrapObject( computeResolutionsToTranscode({ inputResolution: maxResolution, type: 'vod', includeInputResolution: true }), - 'filter:transcoding.manual.lower-resolutions-to-transcode.result', + 'filter:transcoding.manual.resolutions-to-transcode.result', body ) diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index b07876a1c..890d34e3b 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts @@ -266,7 +266,7 @@ async function createLowerResolutionsJobs (options: { // Create transcoding jobs if there are enabled resolutions const resolutionsEnabled = await Hooks.wrapObject( computeResolutionsToTranscode({ inputResolution: videoFileResolution, type: 'vod', includeInputResolution: false }), - 'filter:transcoding.auto.lower-resolutions-to-transcode.result', + 'filter:transcoding.auto.resolutions-to-transcode.result', options ) diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts index 1d1ecd935..3ac57fa44 100644 --- a/server/lib/live/live-manager.ts +++ b/server/lib/live/live-manager.ts @@ -245,7 +245,7 @@ class LiveManager { const allResolutions = await Hooks.wrapObject( this.buildAllResolutionsToTranscode(resolution), - 'filter:transcoding.auto.lower-resolutions-to-transcode.result', + 'filter:transcoding.auto.resolutions-to-transcode.result', { video } ) diff --git a/server/tests/fixtures/peertube-plugin-test/main.js b/server/tests/fixtures/peertube-plugin-test/main.js index b3febfa12..813482a27 100644 --- a/server/tests/fixtures/peertube-plugin-test/main.js +++ b/server/tests/fixtures/peertube-plugin-test/main.js @@ -301,7 +301,7 @@ async function register ({ registerHook, registerSetting, settingsManager, stora }) registerHook({ - target: 'filter:transcoding.auto.lower-resolutions-to-transcode.result', + target: 'filter:transcoding.auto.resolutions-to-transcode.result', handler: (object, context) => { if (context.video.name.includes('transcode-filter')) { object = [ 100 ] diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index 015459ead..7e98d9be6 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts @@ -680,7 +680,7 @@ describe('Test plugin filter hooks', function () { describe('Transcoding filters', async function () { - it('Should run filter:transcoding.auto.lower-resolutions-to-transcode.result', async function () { + it('Should run filter:transcoding.auto.resolutions-to-transcode.result', async function () { const { uuid } = await servers[0].videos.quickUpload({ name: 'transcode-filter' }) await waitJobs(servers) diff --git a/shared/models/plugins/server/server-hook.model.ts b/shared/models/plugins/server/server-hook.model.ts index c8e879323..5bf01c4b4 100644 --- a/shared/models/plugins/server/server-hook.model.ts +++ b/shared/models/plugins/server/server-hook.model.ts @@ -102,8 +102,8 @@ export const serverFilterHookObject = { 'filter:job-queue.process.params': true, 'filter:job-queue.process.result': true, - 'filter:transcoding.manual.lower-resolutions-to-transcode.result': true, - 'filter:transcoding.auto.lower-resolutions-to-transcode.result': true + 'filter:transcoding.manual.resolutions-to-transcode.result': true, + 'filter:transcoding.auto.resolutions-to-transcode.result': true } export type ServerFilterHookName = keyof typeof serverFilterHookObject -- 2.41.0