Add last played search filter in song select

osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs

@@ -316,5 +316,86 @@ public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
                 return false;
             }
         }
+
+        //Date criteria testing
+
+        private static readonly object[] correct_date_query_examples =
+        {
+            new object[] { "600" },
+            new object[] { "0.5s" },
+            new object[] { "120m" },
+            new object[] { "48h120s" },
+            new object[] { "10y24M" },
+            new object[] { "10y60d120s" },
+            new object[] { "0.1y0.1M2d" },
+            new object[] { "0.99y0.99M2d" }
+        };
+
+        [Test]
+        [TestCaseSource(nameof(correct_date_query_examples))]
+        public void TestValidDateQueries(string dateQuery)
+        {
+            string query = $"played={dateQuery} time";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(true, filterCriteria.LastPlayed.HasFilter);
+        }
+
+        private static readonly object[] incorrect_date_query_examples =
+        {
+            new object[] { "7m27" },
+            new object[] { "7m7m7m" },
+            new object[] { "5s6m" },
+            new object[] { "7d7y" },
+            new object[] { ":0" },
+            new object[] { "0:3:6" },
+            new object[] { "0:3:" },
+            new object[] { "\"three days\"" }
+        };
+
+        [Test]
+        [TestCaseSource(nameof(incorrect_date_query_examples))]
+        public void TestInvalidDateQueries(string dateQuery)
+        {
+            string query = $"played={dateQuery} time";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(false, filterCriteria.LastPlayed.HasFilter);
+        }
+
+        private static readonly object[] list_operators =
+        {
+            new object[] { "=", false, false, true, true },
+            new object[] { ":", false, false, true, true },
+            new object[] { "<", false, true, false, false },
+            new object[] { "<=", false, true, true, false },
+            new object[] { "<:", false, true, true, false },
+            new object[] { ">", true, false, false, false },
+            new object[] { ">=", true, false, false, true },
+            new object[] { ">:", true, false, false, true }
+        };
+
+        [Test]
+        [TestCaseSource(nameof(list_operators))]
+        public void TestComparisonDateQueries(string ope, bool minIsNull, bool maxIsNull, bool isLowerInclusive, bool isUpperInclusive)
+        {
+            string query = $"played{ope}50";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(isLowerInclusive, filterCriteria.LastPlayed.IsLowerInclusive);
+            Assert.AreEqual(isUpperInclusive, filterCriteria.LastPlayed.IsUpperInclusive);
+            Assert.AreEqual(maxIsNull, filterCriteria.LastPlayed.Max == null);
+            Assert.AreEqual(minIsNull, filterCriteria.LastPlayed.Min == null);
+        }
+
+        [Test]
+        public void TestOutofrangeDateQuery()
+        {
+            const string query = "played=10000y";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(true, filterCriteria.LastPlayed.HasFilter);
+            Assert.AreEqual(DateTimeOffset.MinValue.AddMilliseconds(1), filterCriteria.LastPlayed.Min);
+        }
     }
 }

osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs

@@ -48,6 +48,7 @@ private bool checkMatch(FilterCriteria criteria)
             match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.Difficulty.CircleSize);
             match &= !criteria.OverallDifficulty.HasFilter || criteria.OverallDifficulty.IsInRange(BeatmapInfo.Difficulty.OverallDifficulty);
             match &= !criteria.Length.HasFilter || criteria.Length.IsInRange(BeatmapInfo.Length);
+            match &= !criteria.LastPlayed.HasFilter || criteria.LastPlayed.IsInRange(BeatmapInfo.LastPlayed ?? DateTimeOffset.MinValue);
             match &= !criteria.BPM.HasFilter || criteria.BPM.IsInRange(BeatmapInfo.BPM);
 
             match &= !criteria.BeatDivisor.HasFilter || criteria.BeatDivisor.IsInRange(BeatmapInfo.BeatDivisor);

osu.Game/Screens/Select/FilterCriteria.cs

@@ -31,6 +31,7 @@ public class FilterCriteria
         public OptionalRange<double> BPM;
         public OptionalRange<int> BeatDivisor;
         public OptionalRange<BeatmapOnlineStatus> OnlineStatus;
+        public OptionalRange<DateTimeOffset> LastPlayed;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
 

osu.Game/Screens/Select/FilterQueryParser.cs

@@ -61,6 +61,10 @@ private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key,
                 case "length":
                     return tryUpdateLengthRange(criteria, op, value);
 
+                case "played":
+                case "lastplayed":
+                    return tryUpdateDateRange(ref criteria.LastPlayed, op, value);
+
                 case "divisor":
                     return TryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
@@ -109,7 +113,8 @@ private static Operator parseOperator(string value)
             value.EndsWith("ms", StringComparison.Ordinal) ? 1 :
             value.EndsWith('s') ? 1000 :
             value.EndsWith('m') ? 60000 :
-            value.EndsWith('h') ? 3600000 : 1000;
+            value.EndsWith('h') ? 3600000 :
+            value.EndsWith('d') ? 86400000 : 1000;
 
         private static bool tryParseFloatWithPoint(string value, out float result) =>
             float.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
@@ -368,5 +373,94 @@ private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, s
 
             return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
+
+        private static bool tryUpdateDateRange(ref FilterCriteria.OptionalRange<DateTimeOffset> dateRange, Operator op, string val)
+        {
+            GroupCollection? match = null;
+
+            match ??= tryMatchRegex(val, @"^((?<years>\d+(\.\d+)?)y)?((?<months>\d+(\.\d+)?)M)?((?<days>\d+(\.\d+)?)d)?((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$");
+            match ??= tryMatchRegex(val, @"^(?<days>\d+(\.\d+)?)$");
+
+            if (match == null)
+                return false;
+
+            DateTimeOffset dateTimeOffset = DateTimeOffset.Now;
+
+            try
+            {
+                List<string> keys = new List<string> { "seconds", "minutes", "hours", "days", "months", "years" };
+
+                foreach (string key in keys)
+                {
+                    if (match[key].Success)
+                    {
+                        if (!tryParseDoubleWithPoint(match[key].Value, out double length))
+                            return false;
+
+                        switch (key)
+                        {
+                            case "seconds":
+                                dateTimeOffset = dateTimeOffset.AddSeconds(-length);
+                                break;
+
+                            case "minutes":
+                                dateTimeOffset = dateTimeOffset.AddMinutes(-length);
+                                break;
+
+                            case "hours":
+                                dateTimeOffset = dateTimeOffset.AddHours(-length);
+                                break;
+
+                            case "days":
+                                dateTimeOffset = dateTimeOffset.AddDays(-length);
+                                break;
+
+                            case "months":
+                                dateTimeOffset = dateTimeOffset.AddMonths(-(int)Math.Floor(length));
+                                dateTimeOffset = dateTimeOffset.AddDays(-30 * (length - Math.Floor(length)));
+                                break;
+
+                            case "years":
+                                dateTimeOffset = dateTimeOffset.AddYears(-(int)Math.Floor(length));
+                                dateTimeOffset = dateTimeOffset.AddDays(-365 * (length - Math.Floor(length)));
+                                break;
+                        }
+                    }
+                }
+            }
+            // If DateTime to compare is out-scope put it to Min
+            catch (Exception)
+            {
+                dateTimeOffset = DateTimeOffset.MinValue;
+                dateTimeOffset = dateTimeOffset.AddMilliseconds(1);
+            }
+
+            return tryUpdateCriteriaRange(ref dateRange, invert(op), dateTimeOffset);
+        }
+
+        // Function to reverse an Operator
+        private static Operator invert(Operator ope)
+        {
+            switch (ope)
+            {
+                default:
+                    return Operator.Equal;
+
+                case Operator.Equal:
+                    return Operator.Equal;
+
+                case Operator.Greater:
+                    return Operator.Less;
+
+                case Operator.GreaterOrEqual:
+                    return Operator.LessOrEqual;
+
+                case Operator.Less:
+                    return Operator.Greater;
+
+                case Operator.LessOrEqual:
+                    return Operator.GreaterOrEqual;
+            }
+        }
     }
 }