From af3f7dcbbfb3e5b955f45e56815238eae71ccbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Mar 2024 18:31:07 +0100
Subject: [PATCH] Retouch update criteria method

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 30 ++++++++------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 194a288426..32b533e18d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -311,44 +311,38 @@ namespace osu.Game.Screens.Select
         /// <param name="val">The value of the keyword filter.</param>
         /// <param name="parseFunction">Function used to determine if <paramref name="val"/> can be converted to type <typeparamref name="T"/>.</param>
         public static bool TryUpdateCriteriaSet<T>(ref FilterCriteria.OptionalSet<T> range, Operator op, string val, TryParseFunction<T> parseFunction)
-            where T : struct
+            where T : struct, Enum
             => parseFunction.Invoke(val, out var converted) && tryUpdateCriteriaSet(ref range, op, converted);
 
-        private static bool tryUpdateCriteriaSet<T>(ref FilterCriteria.OptionalSet<T> range, Operator op, T value)
-            where T : struct
+        private static bool tryUpdateCriteriaSet<T>(ref FilterCriteria.OptionalSet<T> range, Operator op, T pivotValue)
+            where T : struct, Enum
         {
-            var enumValues = (T[])Enum.GetValues(typeof(T));
+            var allDefinedValues = Enum.GetValues<T>();
 
-            foreach (var enumValue in enumValues)
+            foreach (var val in allDefinedValues)
             {
+                int compareResult = Comparer<T>.Default.Compare(val, pivotValue);
+
                 switch (op)
                 {
                     case Operator.Less:
-                        if (Comparer<T>.Default.Compare(enumValue, value) < 0)
-                            range.Values.Add(enumValue);
-
+                        if (compareResult < 0) range.Values.Add(val);
                         break;
 
                     case Operator.LessOrEqual:
-                        if (Comparer<T>.Default.Compare(enumValue, value) <= 0)
-                            range.Values.Add(enumValue);
-
+                        if (compareResult <= 0) range.Values.Add(val);
                         break;
 
                     case Operator.Equal:
-                        range.Values.Add(value);
+                        if (compareResult == 0) range.Values.Add(val);
                         break;
 
                     case Operator.GreaterOrEqual:
-                        if (Comparer<T>.Default.Compare(enumValue, value) >= 0)
-                            range.Values.Add(enumValue);
-
+                        if (compareResult >= 0) range.Values.Add(val);
                         break;
 
                     case Operator.Greater:
-                        if (Comparer<T>.Default.Compare(enumValue, value) > 0)
-                            range.Values.Add(enumValue);
-
+                        if (compareResult > 0) range.Values.Add(val);
                         break;
 
                     default: