RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30684 from Joehuu/source-filter 

Add missing source query filter in song select
This commit is contained in:
Dan Balasescu 2024-11-18 16:06:26 +09:00 committed by GitHub
parent 5622da801a 465cc716d3
commit 5276f77ebd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
View File

@ -148,6 +148,7 @@ public void TestCriteriaMatchingRangeMax(bool inclusive)
[TestCase("tags too", false)]
[TestCase("version", false)]
[TestCase("an auteur", true)]
[TestCase("unit", false)]
public void TestCriteriaMatchingTerms(string terms, bool filtered)
{
var exampleBeatmapInfo = getExampleBeatmap();
@ -175,6 +176,7 @@ public void TestCriteriaMatchingTerms(string terms, bool filtered)
[TestCase("\"Artist\"!", true)]
[TestCase("\"The Artist\"!", false)]
[TestCase("\"the artist\"!", false)]
[TestCase("\"unit tests\"!", false)]
[TestCase("\"\\\"", true)] // nasty case, covers properly escaping user input in underlying regex.
public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
{

12
osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
View File

@ -501,6 +501,18 @@ public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
Assert.That(visibleBeatmaps, Is.EqualTo(expectedBeatmapIndexes));
}
[Test]
public void TestApplySourceQueries()
{
const string query = "find me songs with source=\"unit tests\" please";
var filterCriteria = new FilterCriteria();
FilterQueryParser.ApplyQueries(filterCriteria, query);
Assert.AreEqual("find me songs with please", filterCriteria.SearchText.Trim());
Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
Assert.AreEqual("unit tests", filterCriteria.Source.SearchTerm);
Assert.That(filterCriteria.Source.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
}
private class CustomFilterCriteria : IRulesetFilterCriteria
{
public string? CustomValue { get; set; }

1
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -81,6 +81,7 @@ private bool checkMatch(FilterCriteria criteria)
match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName);
match &= !criteria.Source.HasFilter || criteria.Source.Matches(BeatmapInfo.Metadata.Source);
match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
if (!match) return false;

1
osu.Game/Screens/Select/FilterCriteria.cs
View File

@ -43,6 +43,7 @@ public class FilterCriteria
public OptionalTextFilter Artist;
public OptionalTextFilter Title;
public OptionalTextFilter DifficultyName;
public OptionalTextFilter Source;
public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
{

3
osu.Game/Screens/Select/FilterQueryParser.cs
View File

@ -113,6 +113,9 @@ private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key,
case "diff":
return TryUpdateCriteriaText(ref criteria.DifficultyName, op, value);
case "source":
return TryUpdateCriteriaText(ref criteria.Source, op, value);
default:
return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
}