h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 07:33:20 +08:00
Code Issues Releases Wiki Activity

Add missing "title=" search support at song select

Browse Source
This commit is contained in:
Dean Herbert 2023-06-27 15:21:13 +09:00
parent 9b08aaf93f
commit 702266198b
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
Artist = "The Artist", Artist = "The Artist",
ArtistUnicode = "check unicode too", ArtistUnicode = "check unicode too",
Title = "Title goes here", Title = "Title goes here",
TitleUnicode = "Title goes here", TitleUnicode = "TitleUnicode goes here",
Author = { Username = "The Author" }, Author = { Username = "The Author" },
Source = "unit tests", Source = "unit tests",
Tags = "look for tags too", Tags = "look for tags too",
@ -204,6 +204,27 @@ namespace osu.Game.Tests.NonVisual.Filtering
Assert.AreEqual(filtered, carouselItem.Filtered.Value); Assert.AreEqual(filtered, carouselItem.Filtered.Value);
} }
[Test]
[TestCase("", false)]
[TestCase("Goes", false)]
[TestCase("GOES", false)]
[TestCase("goes", false)]
[TestCase("title goes", false)]
[TestCase("title goes AND then something else", true)]
[TestCase("titleunicode", false)]
[TestCase("unknown", true)]
public void TestCriteriaMatchingTitle(string titleName, bool filtered)
{
var exampleBeatmapInfo = getExampleBeatmap();
var criteria = new FilterCriteria
{
Title = new FilterCriteria.OptionalTextFilter { SearchTerm = titleName }
};
var carouselItem = new CarouselBeatmap(exampleBeatmapInfo);
carouselItem.Filter(criteria);
Assert.AreEqual(filtered, carouselItem.Filtered.Value);
}
[Test] [Test]
[TestCase("", false)] [TestCase("", false)]
[TestCase("The", false)] [TestCase("The", false)]

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

@ -57,6 +57,8 @@ namespace osu.Game.Screens.Select.Carousel
match &= !criteria.Creator.HasFilter || criteria.Creator.Matches(BeatmapInfo.Metadata.Author.Username); match &= !criteria.Creator.HasFilter || criteria.Creator.Matches(BeatmapInfo.Metadata.Author.Username);
match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) || match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) ||
criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode); criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating); match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);

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

@ -31,6 +31,7 @@ namespace osu.Game.Screens.Select
public OptionalRange<BeatmapOnlineStatus> OnlineStatus; public OptionalRange<BeatmapOnlineStatus> OnlineStatus;
public OptionalTextFilter Creator; public OptionalTextFilter Creator;
public OptionalTextFilter Artist; public OptionalTextFilter Artist;
public OptionalTextFilter Title;
public OptionalRange<double> UserStarDifficulty = new OptionalRange<double> public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
{ {

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

@ -73,6 +73,9 @@ namespace osu.Game.Screens.Select
case "artist": case "artist":
return TryUpdateCriteriaText(ref criteria.Artist, op, value); return TryUpdateCriteriaText(ref criteria.Artist, op, value);
case "title":
return TryUpdateCriteriaText(ref criteria.Title, op, value);
default: default:
return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false; return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
} }