Fix resolution to transcode hook name

diff --git a/server/controllers/api/videos/transcoding.ts b/server/controllers/api/videos/transcoding.ts
index 09ab7dc0f424c96f5f2ca44aeca81e3c12f5ff22..7d924c5ac4b4f863d891bcfd0ea107bc9a294bec 100644 (file)
--- 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 b07876a1c87a817e6ae4bb840e921bcbe36d7fb6..890d34e3b8e64e10165e71676a2b3c745ca91e7c 100644 (file)
--- 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 1d1ecd935ae885765373671a588065d05ea5a970..3ac57fa440658751e077e4db7a8c4f9b2255ffc4 100644 (file)
--- 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 b3febfa12b7360b53c1ad8987444f33a1332649c..813482a270f0e90198083befb8630f99f89539c7 100644 (file)
--- 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 015459ead183bd0edc9896b522c838cee5d670ed..7e98d9be6519bec02b7c2bb4a4a21df2572d5751 100644 (file)
--- 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 c8e879323e2a41c937196f94cd1dd50df507ffb9..5bf01c4b47dc46c659d83a7575cd4619cd8c0c7b 100644 (file)
--- 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