Add state and logical comparators

This commit never should have been this big, but .NET 6 got bundled in and here we are.

Configuration/Config.cs

@@ -10,92 +10,91 @@
 using Newtonsoft.Json;
 using Virpil.Communicator;
 
-namespace Configuration
+namespace Configuration;
+
+public class Config
 {
-    public class Config
-    {
-        public LogLevel? LogLevel { get; set; }
-        public bool CheckUpdates { get; set; } = true;
-        public bool CheckPrerelease { get; set; } = false;
-        public HashSet<string> DisabledPlugins { get; set; } = new();
+    public LogLevel? LogLevel { get; set; }
+    public bool CheckUpdates { get; set; } = true;
+    public bool CheckPrerelease { get; set; } = false;
+    public HashSet<string> DisabledPlugins { get; set; } = new();
 
-        public Dictionary<string, Device>? Devices { get; set; }
+    public Dictionary<string, Device>? Devices { get; set; }
 
-        /// <summary>
-        /// Appends the devices of the provided config to this config.
-        /// </summary>
-        /// <param name="otherConfig"></param>
-        public Config Append(Config otherConfig)
+    /// <summary>
+    /// Appends the devices of the provided config to this config.
+    /// </summary>
+    /// <param name="otherConfig"></param>
+    public Config Append(Config otherConfig)
+    {
+        if (otherConfig.LogLevel is not null)
         {
-            if (otherConfig.LogLevel is not null)
-            {
-                LogLevel = (LogLevel) Math.Min((int) (LogLevel ?? Microsoft.Extensions.Logging.LogLevel.None),
-                    (int) otherConfig.LogLevel);
-            }
+            LogLevel = (LogLevel) Math.Min((int) (LogLevel ?? Microsoft.Extensions.Logging.LogLevel.None),
+                (int) otherConfig.LogLevel);
+        }
 
-            if (otherConfig.CheckPrerelease) CheckPrerelease = otherConfig.CheckPrerelease;
-            if (otherConfig.CheckUpdates) CheckUpdates = otherConfig.CheckUpdates;
-            DisabledPlugins.UnionWith(otherConfig.DisabledPlugins);
+        if (otherConfig.CheckPrerelease) CheckPrerelease = otherConfig.CheckPrerelease;
+        if (otherConfig.CheckUpdates) CheckUpdates = otherConfig.CheckUpdates;
+        DisabledPlugins.UnionWith(otherConfig.DisabledPlugins);
 
-            if (otherConfig.Devices != null)
+        if (otherConfig.Devices != null)
+        {
+            if (Devices is null) Devices = new Dictionary<string, Device>();
+            foreach (var (deviceId, device) in otherConfig.Devices)
             {
-                if (Devices is null) Devices = new Dictionary<string, Device>();
-                foreach (var (deviceId, device) in otherConfig.Devices)
+                if (Devices.TryGetValue(deviceId, out var thisDevice))
                 {
-                    if (Devices.TryGetValue(deviceId, out var thisDevice))
+                    foreach (var (boardType, boardActions) in device)
                     {
-                        foreach (var (boardType, boardActions) in device)
+                        if (Devices[deviceId].TryGetValue(boardType, out var thisBoardActions))
                         {
-                            if (Devices[deviceId].TryGetValue(boardType, out var thisBoardActions))
+                            foreach (var (ledNumber, ledActions) in boardActions)
                             {
-                                foreach (var (ledNumber, ledActions) in boardActions)
+                                if (Devices[deviceId][boardType].TryGetValue(ledNumber, out var thisLedActions))
                                 {
-                                    if (Devices[deviceId][boardType].TryGetValue(ledNumber, out var thisLedActions))
-                                    {
-                                        thisLedActions.AddRange(ledActions);
-                                    }
-                                    else
-                                    {
-                                        thisLedActions = ledActions;
-                                    }
-
-                                    Devices[deviceId][boardType][ledNumber] = thisLedActions;
+                                    thisLedActions.AddRange(ledActions);
+                                }
+                                else
+                                {
+                                    thisLedActions = ledActions;
                                 }
-                            }
-                            else
-                            {
-                                thisBoardActions = boardActions;
-                            }
 
-                            Devices[deviceId][boardType] = thisBoardActions;
+                                Devices[deviceId][boardType][ledNumber] = thisLedActions;
+                            }
+                        }
+                        else
+                        {
+                            thisBoardActions = boardActions;
                         }
-                    }
-                    else
-                    {
-                        thisDevice = device;
-                    }
 
-                    Devices[deviceId] = thisDevice;
+                        Devices[deviceId][boardType] = thisBoardActions;
+                    }
+                }
+                else
+                {
+                    thisDevice = device;
                 }
-            }
 
-            return this;
+                Devices[deviceId] = thisDevice;
+            }
         }
 
-        public static Config? GetAllConfiguration()
-        {
-            return Directory.EnumerateFiles("Configuration", "*.json", SearchOption.AllDirectories).AsParallel()
-                .Select(f => JsonConvert.DeserializeObject<Config>(File.ReadAllText(f)))
-                .Where(c => c != null)
-                .Aggregate((s, t) => s!.Append(t!));
-        }
+        return this;
     }
 
-    public class Device : Dictionary<BoardType, BoardActions>
+    public static Config? GetAllConfiguration()
     {
+        return Directory.EnumerateFiles("Configuration", "*.json", SearchOption.AllDirectories).AsParallel()
+            .Select(f => JsonConvert.DeserializeObject<Config>(File.ReadAllText(f)))
+            .Where(c => c != null)
+            .Aggregate((s, t) => s!.Append(t!));
     }
+}
 
-    public class BoardActions : Dictionary<int, List<LedAction>>
-    {
-    }
-}
+public class Device : Dictionary<BoardType, BoardActions>
+{
+}
+
+public class BoardActions : Dictionary<int, List<LedAction>>
+{
+}

Configuration/Configuration.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
+        <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -16,4 +17,8 @@
       </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\Core\Core.csproj" />
+    </ItemGroup>
+
 </Project>

Configuration/LedAction.cs

@@ -1,12 +1,14 @@
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 // ReSharper disable ClassNeverInstantiated.Global
+
+using Core;
+
 #pragma warning disable 8618
 
-namespace Configuration
+namespace Configuration;
+
+public class LedAction
 {
-    public class LedAction
-    {
-        public string Color { get; set; }
-        public Trigger Trigger { get; set; }
-    }
-}
+    public string Color { get; set; }
+    public BaseTrigger Trigger { get; set; }
+}

Configuration/Schema/ActionConfiguration.json.schema

@@ -9,7 +9,7 @@
             "title": "LED Action",
             "description": "An action to take for a USB LED",
             "type": "array",
-            
+
             "definitions": {
                 "action": {
                     "title": "Action",
@@ -29,12 +29,18 @@
                                 },
                                 "value": {
                                     "description": "The fixed value to compare the sent value to",
-                                    "type": ["number", "string", "boolean"]
+                                    "oneOf": [
+                                        {"type": "number"},
+                                        {"type": "string"},
+                                        {"type": "boolean"},
+                                        {"$ref": "#/definitions/ledAction/definitions/action/definitions/trigger"},
+                                        {"type": "array", "items": {"$ref": "#/definitions/ledAction/definitions/action/definitions/trigger"}}
+                                    ]
                                 },
                                 "comparator": {
                                     "description": "The method to compare the dcs-bios value with. The equation should read as 'biosValue comparator value'",
                                     "type": "string",
-                                    "enum": ["None", "GreaterThan", "LessThan", "EqualTo", "NotEqualTo", "GreaterThanOrEqualTo", "LessThanOrEqualTo", "RegexMatch", "RegexNoMatch"]
+                                    "enum": ["None", "GreaterThan", "LessThan", "EqualTo", "NotEqualTo", "GreaterThanOrEqualTo", "LessThanOrEqualTo", "RegexMatch", "RegexNoMatch", "And", "Or", "Xor", "Not"]
                                 }
                             },
                             "additionalProperties": false,
@@ -71,11 +77,31 @@
                                 },
                                 {
                                     "if": {
-                                        "required": ["comparator"]
+                                        "properties": { "value": { "$ref": "#/definitions/ledAction/definitions/action/definitions/trigger" } },
+                                        "required": ["value"]
                                     },
                                     "then": {
+                                        "properties": { "comparator": { "enum": ["Not"] } },
                                         "required": ["id", "value", "comparator"]
                                     }
+                                },
+                                {
+                                    "if": {
+                                        "properties": { "value": { "type": "array", "items": {"$ref": "#/definitions/ledAction/definitions/action/definitions/trigger"}}},
+                                        "required": ["value"]
+                                    },
+                                    "then": {
+                                        "properties": { "comparator": { "enum": ["And", "Or", "Xor"] } },
+                                        "required": ["value", "comparator"]
+                                    }
+                                },
+                                {
+                                    "if": {
+                                        "required": ["comparator"]
+                                    },
+                                    "then": {
+                                        "required": ["value", "comparator"]
+                                    }
                                 }
                             ],
                             "required": ["id"]
@@ -174,4 +200,4 @@
     },
 
     "required": ["devices"]
-}
+}

Core/AndTrigger.cs

@@ -0,0 +1,18 @@
+namespace Core;
+
+/**
+ * Triggers if all of the child triggers pass.
+ */
+public class AndTrigger : BaseTrigger<List<BaseTrigger>>
+{
+    public AndTrigger(IReadOnlyCollection<BaseTrigger> value) : base(value, Comparator.And)
+    {
+    }
+
+    public override bool ShouldTrigger(State state)
+    {
+        return Value.All(t => t.ShouldTrigger(state));
+    }
+
+    protected override HashSet<Comparator> AllowedComparators { get; } = new(Enum.GetValues<Comparator>());
+}