scripts: remove priority from all hooks and set up some basic dependencies

This commit is contained in:
George Kiagiadakis 2022-11-30 20:24:09 +02:00 committed by Julian Bouzas
parent ffa85840ac
commit e1a8c3459a
15 changed files with 7 additions and 33 deletions

View file

@ -67,7 +67,6 @@ end
AsyncEventHook {
name = "node-added@create-item",
priority = HookPriority.LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-added" },
@ -138,7 +137,6 @@ AsyncEventHook {
SimpleEventHook {
name = "node-removed@create-item",
priority = HookPriority.LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-removed" },

View file

@ -9,7 +9,6 @@ sources = {}
SimpleEventHook {
name = "suspend-node",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-state-changed" },

View file

@ -387,7 +387,6 @@ end
SimpleEventHook {
name = "input-stream-removed@policy-bluetooth",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-removed" },
@ -404,7 +403,6 @@ SimpleEventHook {
SimpleEventHook {
name = "input-stream-changed@policy-bluetooth",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-state-changed" },
@ -426,7 +424,6 @@ SimpleEventHook {
SimpleEventHook {
name = "bluez-device-added@policy-bluetooth",
priority = HookPriority.VERY_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "device-added" },
@ -445,7 +442,6 @@ SimpleEventHook {
SimpleEventHook {
name = "metadata-changed@policy-bluetooth",
priority = HookPriority.VERY_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "metadata-changed" },

View file

@ -79,8 +79,7 @@ function onLinkGroupPortsStateChanged (si, old_state, new_state)
end
SimpleEventHook {
name = "filter-forward-format@policy-node",
priority = HookPriority.NORMAL,
name = "filter-forward-format@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "session-item-added" },

View file

@ -11,7 +11,7 @@ local cutils = require ("common-utils")
SimpleEventHook {
name = "find-best-target@policy-desktop",
priority = HookPriority.LOW,
after = "find-default-target@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -10,7 +10,7 @@ local putils = require ("policy-utils")
SimpleEventHook {
name = "find-default-target@policy-desktop",
priority = HookPriority.NORMAL,
after = "find-defined-target@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -15,7 +15,6 @@ local config = require ("policy-config")
SimpleEventHook {
name = "find-defined-target@policy-desktop",
priority = HookPriority.HIGH,
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -10,7 +10,7 @@ local putils = require ("policy-utils")
SimpleEventHook {
name = "sample-find-user-target@policy-desktop",
priority = HookPriority.VERY_HIGH,
before = "find-defined-target@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -12,7 +12,7 @@ local cutils = require ("common-utils")
SimpleEventHook {
name = "link-target@policy-desktop",
priority = HookPriority.ULTRA_LOW,
after = "prepare-link@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -14,7 +14,6 @@ function handleFollowSetting (enable)
if (not handles.follow_hook) and (enable == true) then
handles.follow_hook = SimpleEventHook {
name = "follow@policy-desktop",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "metadata-changed" },
@ -39,7 +38,6 @@ function handleMoveSetting (enable)
if (not handles.move_hook) and (enable == true) then
handles.move_hook = SimpleEventHook {
name = "move@policy-desktop",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "metadata-changed" },

View file

@ -13,7 +13,7 @@ local cutils = require ("common-utils")
SimpleEventHook {
name = "prepare-link@policy-desktop",
priority = HookPriority.VERY_LOW,
after = "find-best-target@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "find-target-si-and-link" },

View file

@ -31,8 +31,7 @@ function checkLinkable (si, om, handle_nonstreams)
end
SimpleEventHook {
name = "linkable-removed@policy-node",
priority = HookPriority.VERY_LOW,
name = "linkable-removed@policy-desktop",
interests = {
EventInterest {
Constraint { "event.type", "=", "session-item-removed" },
@ -79,9 +78,6 @@ SimpleEventHook {
SimpleEventHook {
name = "rescan-session@policy-desktop",
-- let higher priority hooks deal with preparing the graph first
-- (things like finding the default nodes, etc...)
priority = HookPriority.VERY_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "rescan-session" },
@ -116,9 +112,6 @@ SimpleEventHook {
SimpleEventHook {
name = "rescan-trigger@policy-desktop",
-- go with a low priority to allow NORMAL handlers
-- to stop the event and prevent the rescan
priority = HookPriority.VERY_LOW,
interests = {
-- on linkable added or removed, where linkable is adapter or plain node
EventInterest {

View file

@ -103,7 +103,6 @@ end
SimpleEventHook {
name = "handle-profiles@policy-device-profile",
priority = HookPriority.LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "device-added" },
@ -165,7 +164,6 @@ SimpleEventHook {
SimpleEventHook {
name = "device-removed@policy-device-profile",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "device-removed" },

View file

@ -469,7 +469,6 @@ end
SimpleEventHook {
name = "handle-device@device-routes",
priority = HookPriority.ULTRA_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "objects-changed" },
@ -510,7 +509,6 @@ SimpleEventHook {
SimpleEventHook {
name = "handle-device@device-routes",
priority = HookPriority.ULTRA_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "device-params-changed" },

View file

@ -345,7 +345,6 @@ local function handleRestoreTargetSetting (enable)
-- save "targe.node" if it is present in default metadata
restore_target_hook_handles [1] = SimpleEventHook {
name = "metadata-added@restore-stream-save-target",
priority = HookPriority.ULTRA_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "metadata-added" },
@ -365,7 +364,6 @@ local function handleRestoreTargetSetting (enable)
-- save "target.node" on metadata changes
restore_target_hook_handles [2] = SimpleEventHook {
name = "metadata-changed@restore-stream-save-target",
priority = HookPriority.ULTRA_LOW,
interests = {
EventInterest {
Constraint { "event.type", "=", "metadata-changed" },
@ -466,7 +464,6 @@ local function handleRestoreStreamSetting (enable)
-- restore-stream properties
restore_stream_hook_handles [1] = SimpleEventHook {
name = "node-added@restore-stream",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-added" },
@ -492,7 +489,6 @@ local function handleRestoreStreamSetting (enable)
-- save-stream if any of the stream parms changes
restore_stream_hook_handles [2] = SimpleEventHook {
name = "node-parms-changed@restore-stream-save-stream",
priority = HookPriority.NORMAL,
interests = {
EventInterest {
Constraint { "event.type", "=", "node-params-changed" },