h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-15 19:17:20 +08:00
Code Issues Releases Wiki Activity

Move filter matching code into own method to simplify early returns

Browse Source
This commit is contained in:
Dean Herbert 2023-03-07 17:24:17 +09:00
parent 1fcf41379d
commit 5af41bb1c8
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,11 @@ namespace osu.Game.Screens.Select.Carousel
{
base.Filter(criteria);
Filtered.Value = !checkMatch(criteria);
}
private bool checkMatch(FilterCriteria criteria)
{
bool match =
criteria.Ruleset == null ||
BeatmapInfo.Ruleset.ShortName == criteria.Ruleset.ShortName ||
@ -34,8 +39,7 @@ namespace osu.Game.Screens.Select.Carousel
if (BeatmapInfo.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
{
// only check ruleset equality or convertability for selected beatmap
Filtered.Value = !match;
return;
return match;
}
match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarRating);
@ -49,11 +53,7 @@ namespace osu.Game.Screens.Select.Carousel
match &= !criteria.BeatDivisor.HasFilter || criteria.BeatDivisor.IsInRange(BeatmapInfo.BeatDivisor);
match &= !criteria.OnlineStatus.HasFilter || criteria.OnlineStatus.IsInRange(BeatmapInfo.Status);
if (!match)
{
Filtered.Value = !match;
return;
}
if (!match) return false;
match &= !criteria.Creator.HasFilter || criteria.Creator.Matches(BeatmapInfo.Metadata.Author.Username);
match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) ||
@ -61,11 +61,7 @@ namespace osu.Game.Screens.Select.Carousel
match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
if (!match)
{
Filtered.Value = !match;
return;
}
if (!match) return false;
if (criteria.SearchTerms.Length > 0)
{
@ -99,18 +95,14 @@ namespace osu.Game.Screens.Select.Carousel
}
}
if (!match)
{
Filtered.Value = !match;
return;
}
if (!match) return false;
match &= criteria.CollectionBeatmapMD5Hashes?.Contains(BeatmapInfo.MD5Hash) ?? true;
if (match && criteria.RulesetCriteria != null)
match &= criteria.RulesetCriteria.Matches(BeatmapInfo);
Filtered.Value = !match;
return match;
}
public override int CompareTo(FilterCriteria criteria, CarouselItem other)