From e1ec552b09ed1b7c3200d220bb3f98600e160106 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Tue, 16 Dec 2025 14:34:08 -0500
Subject: [PATCH] scripts/default-nodes: Restrict to nodes that are not part of
 any collection

Nodes that are part of a collection are handled separately.
---
 src/scripts/default-nodes/apply-default-node.lua         | 5 ++++-
 src/scripts/default-nodes/find-selected-default-node.lua | 5 ++++-
 src/scripts/default-nodes/rescan.lua                     | 6 +++++-
 src/scripts/default-nodes/state-default-nodes.lua        | 2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/scripts/default-nodes/apply-default-node.lua b/src/scripts/default-nodes/apply-default-node.lua
index 608118b7..56ec8d77 100644
--- a/src/scripts/default-nodes/apply-default-node.lua
+++ b/src/scripts/default-nodes/apply-default-node.lua
@@ -23,7 +23,10 @@ SimpleEventHook {
     local selected_node = event:get_data ("selected-node")
 
     local om = source:call ("get-object-manager", "metadata")
-    local metadata = om:lookup { Constraint { "metadata.name", "=", "default" } }
+    local metadata = om:lookup {
+        Constraint { "metadata.name", "=", "default" },
+        Constraint { "wireplumber.collection", "-" },
+    }
     if metadata == nil then
       return
     end
diff --git a/src/scripts/default-nodes/find-selected-default-node.lua b/src/scripts/default-nodes/find-selected-default-node.lua
index 8ece52cd..e9b60d12 100644
--- a/src/scripts/default-nodes/find-selected-default-node.lua
+++ b/src/scripts/default-nodes/find-selected-default-node.lua
@@ -37,7 +37,10 @@ SimpleEventHook {
     local props = event:get_properties ()
     local def_node_type = props ["default-node.type"]
     local metadata_om = source:call ("get-object-manager", "metadata")
-    local metadata = metadata_om:lookup { Constraint { "metadata.name", "=", "default" } }
+    local metadata = metadata_om:lookup {
+        Constraint { "metadata.name", "=", "default" },
+        Constraint { "wireplumber.collection", "-" },
+    }
     local obj = metadata:find (0, "default.configured." .. def_node_type)
 
     if not obj then
diff --git a/src/scripts/default-nodes/rescan.lua b/src/scripts/default-nodes/rescan.lua
index 5ac30c1b..98a2bd09 100644
--- a/src/scripts/default-nodes/rescan.lua
+++ b/src/scripts/default-nodes/rescan.lua
@@ -20,11 +20,13 @@ SimpleEventHook {
       Constraint { "event.type", "c", "session-item-added", "session-item-removed" },
       Constraint { "event.session-item.interface", "=", "linkable" },
       Constraint { "media.class", "#", "Audio/*" },
+      Constraint { "collection.name", "-" },
     },
     EventInterest {
       Constraint { "event.type", "c", "session-item-added", "session-item-removed" },
       Constraint { "event.session-item.interface", "=", "linkable" },
       Constraint { "media.class", "#", "Video/*" },
+      Constraint { "collection.name", "-" },
     },
     EventInterest {
       Constraint { "event.type", "=", "metadata-changed" },
@@ -32,6 +34,7 @@ SimpleEventHook {
       Constraint { "event.subject.key", "c", "default.configured.audio.sink",
           "default.configured.audio.source", "default.configured.video.source"
       },
+      Constraint { "wireplumber.collection", "-" },
     },
     EventInterest {
       Constraint { "event.type", "=", "device-params-changed"},
@@ -96,13 +99,14 @@ function collectAvailableNodes (si_om, devices_om, port_direction, media_classes
   for linkable in si_om:iterate {
     type = "SiLinkable",
     Constraint { "media.class", "c", table.unpack (media_classes) },
+    Constraint { "collection.name", "-" },
   } do
     local node = linkable:get_associated_proxy ("node")
     local node_props = node.properties
 
     -- check that the node has ports in the requested direction
     if not node:lookup_port {
-      Constraint { "port.direction", "=", port_direction }
+      Constraint { "port.direction", "=", port_direction },
     } then
       goto next_linkable
     end
diff --git a/src/scripts/default-nodes/state-default-nodes.lua b/src/scripts/default-nodes/state-default-nodes.lua
index 1f379daf..2fd021b7 100644
--- a/src/scripts/default-nodes/state-default-nodes.lua
+++ b/src/scripts/default-nodes/state-default-nodes.lua
@@ -73,6 +73,7 @@ store_configured_default_nodes_hook = SimpleEventHook {
       Constraint { "event.subject.key", "c", "default.configured.audio.sink",
           "default.configured.audio.source", "default.configured.video.source"
       },
+      Constraint { "wireplumber.collection", "-" },
     },
   },
   execute = function (event)
@@ -119,6 +120,7 @@ metadata_added_hook = SimpleEventHook {
     EventInterest {
       Constraint { "event.type", "=", "metadata-added" },
       Constraint { "metadata.name", "=", "default" },
+      Constraint { "wireplumber.collection", "-" },
     },
   },
   execute = function (event)