Update OptionalSet implementation to intersect across multiple filt…

…ers rather than union
ppy · Mar 26, 2024 · e52d51c · e52d51c
1 parent c24eb06
commit e52d51c
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 35 deletions.
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -114,17 +114,18 @@ public string SearchText
 
         public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
-        public struct OptionalSet<T> : IEquatable<OptionalSet<T>>
-            where T : struct
+        public readonly struct OptionalSet<T> : IEquatable<OptionalSet<T>>
+            where T : struct, Enum
         {
-            public bool HasFilter => Values.Count > 0;
+            public bool HasFilter => true;
 
             public bool IsInRange(T value) => Values.Contains(value);
 
-            public HashSet<T> Values = new HashSet<T>();
+            public HashSet<T> Values { get; }
 
             public OptionalSet()
             {
+                Values = Enum.GetValues<T>().ToHashSet();
             }
 
             public bool Equals(OptionalSet<T> other) => Values.SetEquals(other.Values);

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -69,7 +69,7 @@ private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key,
                     return TryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
                 case "status":
-                    return TryUpdateCriteriaSet(ref criteria.OnlineStatus, op, value, tryParseEnum);
+                    return TryUpdateCriteriaSet(ref criteria.OnlineStatus, op, value);
 
                 case "creator":
                 case "author":
@@ -302,54 +302,70 @@ public static bool TryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T>
 
         /// <summary>
         /// Attempts to parse a keyword filter of type <typeparamref name="T"/>,
-        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
-        /// If <paramref name="val"/> can be parsed into <typeparamref name="T"/> using <paramref name="parseFunction"/>, the function returns <c>true</c>
+        /// from the specified <paramref name="op"/> and <paramref name="filterValue"/>.
+        /// If <paramref name="filterValue"/> can be parsed successfully, the function returns <c>true</c>
         /// and the resulting range constraint is stored into the <paramref name="range"/>'s expected values.
         /// </summary>
         /// <param name="range">The <see cref="FilterCriteria.OptionalSet{T}"/> to store the parsed data into, if successful.</param>
         /// <param name="op">The operator for the keyword filter.</param>
-        /// <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, 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 pivotValue)
+        /// <param name="filterValue">The value of the keyword filter.</param>
+        public static bool TryUpdateCriteriaSet<T>(ref FilterCriteria.OptionalSet<T> range, Operator op, string filterValue)
             where T : struct, Enum
         {
-            var allDefinedValues = Enum.GetValues<T>();
+            var matchingValues = new HashSet<T>();
+
+            if (op == Operator.Equal && filterValue.Contains(','))
+            {
+                string[] splitValues = filterValue.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
+                foreach (string splitValue in splitValues)
+                {
+                    if (!tryParseEnum<T>(splitValue, out var parsedValue))
+                        return false;
 
-            foreach (var val in allDefinedValues)
+                    matchingValues.Add(parsedValue);
+                }
+            }
+            else
             {
-                int compareResult = Comparer<T>.Default.Compare(val, pivotValue);
+                if (!tryParseEnum<T>(filterValue, out var pivotValue))
+                    return false;
+
+                var allDefinedValues = Enum.GetValues<T>();
 
-                switch (op)
+                foreach (var val in allDefinedValues)
                 {
-                    case Operator.Less:
-                        if (compareResult < 0) range.Values.Add(val);
-                        break;
+                    int compareResult = Comparer<T>.Default.Compare(val, pivotValue);
 
-                    case Operator.LessOrEqual:
-                        if (compareResult <= 0) range.Values.Add(val);
-                        break;
+                    switch (op)
+                    {
+                        case Operator.Less:
+                            if (compareResult < 0) matchingValues.Add(val);
+                            break;
 
-                    case Operator.Equal:
-                        if (compareResult == 0) range.Values.Add(val);
-                        break;
+                        case Operator.LessOrEqual:
+                            if (compareResult <= 0) matchingValues.Add(val);
+                            break;
 
-                    case Operator.GreaterOrEqual:
-                        if (compareResult >= 0) range.Values.Add(val);
-                        break;
+                        case Operator.Equal:
+                            if (compareResult == 0) matchingValues.Add(val);
+                            break;
 
-                    case Operator.Greater:
-                        if (compareResult > 0) range.Values.Add(val);
-                        break;
+                        case Operator.GreaterOrEqual:
+                            if (compareResult >= 0) matchingValues.Add(val);
+                            break;
 
-                    default:
-                        return false;
+                        case Operator.Greater:
+                            if (compareResult > 0) matchingValues.Add(val);
+                            break;
+
+                        default:
+                            return false;
+                    }
                 }
             }
 
+            range.Values.IntersectWith(matchingValues);
             return true;
         }