Fixed bug in CombineWithBrightness (#214)

* Fixed naming issues.

* Fixed bug in CombineWithBrightness

Author: DevJasperNL

src/CodeCasa.AutomationPipelines.Lights/Nodes/ManagedNode.cs

@@ -22,7 +22,7 @@ public TState? Input
         public TState? Output => innerNode.Output;
         public IObservable<TState?> OnNewOutput => innerNode.OnNewOutput;
 
-        public override string? ToString() => $"{innerNode} (scoped)";
+        public override string ToString() => $"{innerNode} (scoped)";
 
         public async ValueTask DisposeAsync()
         {

src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.When.cs

@@ -130,7 +130,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen<TObservable>
         }
         return When<TObservable>(c =>
             c.GetRequiredService<LightPipelineFactory>()
-                .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
+                .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.ApplyHierarchySettings($"{HierarchyPath}->Condition", LoggingEnabled ?? false)));
     }
 
     /// <inheritdoc/>
@@ -144,7 +144,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen(IObservable<
         }
         return When(observable, c =>
             c.GetRequiredService<LightPipelineFactory>()
-                .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
+                .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.ApplyHierarchySettings($"{HierarchyPath}->Condition", LoggingEnabled ?? false)));
     }
 
     /// <inheritdoc/>

src/CodeCasa.AutomationPipelines.Lights/Pipeline/ManagedPipeline.cs

@@ -9,26 +9,6 @@ internal sealed class ManagedPipeline<TNode>(IServiceScope scope, IPipeline<TNod
     private readonly IServiceScope _scope = scope ?? throw new ArgumentNullException(nameof(scope));
     private readonly IPipeline<TNode> _instance = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
 
-    public void Dispose()
-    {
-        foreach (var subscription in pipelineSubscriptions)
-        {
-            subscription.Dispose();
-        }
-        (_instance as IDisposable)?.Dispose();
-        _scope.Dispose();
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        foreach (var subscription in pipelineSubscriptions)
-        {
-            subscription.Dispose();
-        }
-        await _instance.DisposeOrDisposeAsync();
-        await _scope.DisposeOrDisposeAsync();
-    }
-
     public Guid Id => pipeline.Id;
     public string? Name
     {
@@ -73,4 +53,29 @@ public IPipeline<TNode> SetOutputHandler(Action<TNode> action, IEqualityComparer
     public IReadOnlyCollection<IPipelineNode<TNode>> Nodes => _instance.Nodes;
 
     public IObservable<PipelineTelemetry<TNode>> Telemetry => _instance.Telemetry;
+
+    public override string ToString()
+    {
+        return $"{pipeline} (scoped)";
+    }
+
+    public void Dispose()
+    {
+        foreach (var subscription in pipelineSubscriptions)
+        {
+            subscription.Dispose();
+        }
+        (_instance as IDisposable)?.Dispose();
+        _scope.Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        foreach (var subscription in pipelineSubscriptions)
+        {
+            subscription.Dispose();
+        }
+        await _instance.DisposeOrDisposeAsync();
+        await _scope.DisposeOrDisposeAsync();
+    }
 }

src/CodeCasa.AutomationPipelines/Pipeline.cs

@@ -17,7 +17,6 @@ public class Pipeline<TState> : PipelineNode<TState>, IPipeline<TState>
     private Action<TState>? _action;
     private IDisposable? _subscription;
     private bool _isDisposed;
-    private string? _name;
 
     /// <summary>
     /// Initializes a new, empty pipeline with no nodes.
@@ -81,18 +80,6 @@ public Pipeline(TState defaultState, params IPipelineNode<TState>[] nodes)
     /// <inheritdoc />
     public IObservable<PipelineTelemetry<TState>> Telemetry => _telemetrySubject.AsObservable();
 
-    /// <summary>
-    /// Sets an optional name for this pipeline, used in ToString() for telemetry and logging.
-    /// </summary>
-    public IPipeline<TState> SetName(string name)
-    {
-        _name = name;
-        return this;
-    }
-
-    /// <inheritdoc />
-    public override string ToString() => _name ?? base.ToString() ?? GetType().Name;
-
     /// <inheritdoc />
     public IPipeline<TState> SetDefault(TState state)
     {

src/CodeCasa.AutomationPipelines/PipelineNode.cs

@@ -124,7 +124,7 @@ private void SetOutputInternal(TState? output)
     }
 
     /// <inheritdoc />
-    public override string ToString() => GetType().Name;
+    public override string ToString() => Name ?? GetType().Name;
 
     /// <inheritdoc />
     public virtual ValueTask DisposeAsync()

src/CodeCasa.NetDaemon.Sensors.Composite/Extensions/BooleanObservableExtensions.cs

@@ -43,28 +43,32 @@ public static IObservable<bool> PersistTrue(
 
         public static IObservable<bool> CombineWithBrightness(this IObservable<bool> motion, IObservable<bool> brightnessLessThanThreshold)
         {
-            bool? triggered = null;
-            return motion.CombineLatest(brightnessLessThanThreshold, (motionTriggered, brightnessTriggered) =>
+            return Observable.Create<bool>(observer =>
             {
-                if (motionTriggered && brightnessTriggered)
+                bool? triggered = null;
+                return motion.CombineLatest(brightnessLessThanThreshold, (motionTriggered, brightnessTriggered) =>
                 {
-                    triggered = true;
-                }
-                else {
-                    if (triggered == false)
+                    if (motionTriggered && brightnessTriggered)
                     {
-                        // Prevent duplicate false emissions.
-                        return null;
+                        triggered = true;
                     }
-
-                    if (!motionTriggered)
+                    else
                     {
-                        triggered = false;
+                        if (triggered == false)
+                        {
+                            // Prevent duplicate false emissions.
+                            return null;
+                        }
+
+                        if (!motionTriggered)
+                        {
+                            triggered = false;
+                        }
                     }
-                }
 
-                return triggered;
-            }).Where(b => b != null).Select(b => b!.Value);
+                    return triggered;
+                }).Where(b => b != null).Select(b => b!.Value).Subscribe(observer);
+            });
         }
     }
 }