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

Expose searchable terms from beatmap info instead

Browse Source
This commit is contained in:
smoogipoo 2020-05-07 13:04:08 +09:00
parent 5186da8412
commit 401c516503
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Beatmaps/BeatmapInfo.cs
View File

@ -149,6 +149,11 @@ namespace osu.Game.Beatmaps
} }
} }
public string[] SearchableTerms => new[]
{
Version
}.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
public override string ToString() public override string ToString()
{ {
string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]"; string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";

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

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Select.Filter; using osu.Game.Screens.Select.Filter;
@ -55,13 +54,10 @@ namespace osu.Game.Screens.Select.Carousel
if (match) if (match)
{ {
var terms = new List<string>(); var terms = Beatmap.SearchableTerms;
terms.AddRange(Beatmap.Metadata.SearchableTerms);
terms.Add(Beatmap.Version);
foreach (var criteriaTerm in criteria.SearchTerms) foreach (var criteriaTerm in criteria.SearchTerms)
match &= terms.Any(term => term?.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0); match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
} }
Filtered.Value = !match; Filtered.Value = !match;