feat: Implement numeric comparisons for notification checks

Author: twpol

Source/Menu/Notifications/NotificationManager.cs

@@ -369,35 +369,12 @@ private bool CheckAllMatch(List<Criteria> criteriaList)
         {
             foreach (var c in criteriaList)
             {
-                if (c is Contains) // other criteria might be added such as NoLessThan and NoMoreThan.
-                {
-                    if (CheckContains(c, true) == false) return false;
-                }
-                if (c is NotContains)
-                {
-                    if (CheckContains(c, false) == false) return false;
-                }
+                var result = c.IsMatch();
+                AppendToLog($"Check: {result}: '{c.Property}' {c.GetType().Name} '{c.Value}'");
+                if (!result) return false;
             }
             return true;
         }
-
-        /// <summary>
-        /// Returns true if a match is found and sense = true. For NotContains, use sense = false.
-        /// </summary>
-        /// <param name="criteria"></param>
-        /// <param name="sense"></param>
-        /// <returns></returns>
-        private bool CheckContains(Criteria criteria, bool sense)
-        {
-            // If Property was a parameter, then use the expansion
-            var content = ParameterDictionary.ContainsKey(criteria.Property)
-                ? ParameterDictionary[criteria.Property]
-                : criteria.Property;
-
-            var result = content.IndexOf(criteria.Value, StringComparison.OrdinalIgnoreCase) > -1 == sense;
-            LogCheckContains(criteria.Value, sense, content, result);
-            return result;
-        }
         #endregion
 
         private void AddItemToPage(NotificationPage page, Item item)
@@ -668,7 +645,7 @@ public void ChangePage(int step)
         }
 
         #region Logging
-        public void LogOverrideParameters()
+        void LogOverrideParameters()
         {
             if (Log == false) return;
 
@@ -680,7 +657,7 @@ public void LogOverrideParameters()
             }
         }
 
-        public void LogParameters()
+        void LogParameters()
         {
             if (Log == false) return;
 
@@ -692,18 +669,12 @@ public void LogParameters()
             }
         }
 
-        public void LogNotification(Notification n)
+        void LogNotification(Notification n)
         {
             AppendToLog($"\r\nNotification: {n.Title}");
         }
 
-        public void LogCheckContains(string value, bool sense, string content, bool result)
-        {
-            var negation = sense ? "" : "NOT ";
-            AppendToLog($"Check: {result} = '{value}' {negation}contained in '{content}'");
-        }
-
-        public void AppendToLog(string record)
+        void AppendToLog(string record)
         {
             if (Log == false) return;
 

Source/Menu/Notifications/Notifications.cs

@@ -85,19 +85,30 @@ public class AnyOf
         public List<Criteria> AllOfList { get; set; }
     }
 
-    class Contains : Criteria { }
-    class NotContains : Criteria { }
+    // These criteria are all doing an actual comparison
+    class Contains : Criteria { public override bool IsMatch() => Property.Contains(Value); }
+    class Equals : Criteria { public override bool IsMatch() => Property == Value; }
+    class LessThan : NumericCriteria { public override bool IsMatch() => PropertyAsInt < ValueAsInt; }
+    class MoreThan : NumericCriteria { public override bool IsMatch() => PropertyAsInt > ValueAsInt; }
 
-    // Not implemented as not needed yet
-    // String comparison, not numerical
-    class NoLessThan : Criteria { }
-    class NoMoreThan : Criteria { }
-    
-    public class Criteria
+    // These criteria are all negated versions of those above
+    class NotContains : Contains { public override bool IsMatch() => !base.IsMatch(); }
+    class NotEquals : Equals { public override bool IsMatch() => !base.IsMatch(); }
+    class MoreThanOrEquals : LessThan { public override bool IsMatch() => !base.IsMatch(); }
+    class LessThanOrEquals : MoreThan { public override bool IsMatch() => !base.IsMatch(); }
+
+    abstract class NumericCriteria : Criteria
+    {
+        public int? PropertyAsInt => int.TryParse(Property, out var value) ? value : (int?)null;
+        public int? ValueAsInt => int.TryParse(Value, out var value) ? value : (int?)null;
+    }
+
+    public abstract class Criteria
     {
-                                                // System Information "examples"
+        // System Information "examples"
         public string Property { get; set; }    // installed_version, direct3d, runtime, system, memory, cpu, gpu
         public string Value { get; set; }       // {{new_version}}, {{10_0}}
+        public abstract bool IsMatch();
     }
 
     public class ParameterValue