From f293e008d953d334ebb291481502679519d2c88c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Oct 2021 17:00:22 +0900
Subject: [PATCH] Move `BeatmapInfo`'s `SearchableTerms` implementation to
 interface

---
 osu.Game/Beatmaps/BeatmapInfo.cs                   |  5 +----
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs |  1 +
 osu.Game/Beatmaps/IBeatmapInfo.cs                  | 13 +++++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 09f237a5de..cd5f8fb9a1 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -152,10 +152,7 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(StarDifficulty);
 
-        public string[] SearchableTerms => new[]
-        {
-            Version
-        }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
+        public IEnumerable<string> SearchableTerms => ((IBeatmapInfo)this).SearchableTerms;
 
         public override string ToString() => ((IBeatmapInfo)this).DisplayTitle;
 
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index f9889474ac..5fec8f7a89 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
diff --git a/osu.Game/Beatmaps/IBeatmapInfo.cs b/osu.Game/Beatmaps/IBeatmapInfo.cs
index d552a3f1e3..fb30b0279c 100644
--- a/osu.Game/Beatmaps/IBeatmapInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapInfo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Rulesets;
@@ -22,7 +23,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The metadata representing this beatmap. May be shared between multiple beatmaps.
         /// </summary>
-        IBeatmapMetadataInfo Metadata { get; }
+        IBeatmapMetadataInfo? Metadata { get; }
 
         /// <summary>
         /// The difficulty settings for this beatmap.
@@ -76,12 +77,20 @@ namespace osu.Game.Beatmaps
         {
             get
             {
-                var metadata = Metadata.DisplayTitleRomanisable;
+                var metadata = closestMetadata.DisplayTitleRomanisable;
 
                 return new RomanisableString($"{metadata.GetPreferred(true)} {versionString}".Trim(), $"{metadata.GetPreferred(false)} {versionString}".Trim());
             }
         }
 
+        string[] SearchableTerms => new[]
+        {
+            DifficultyName
+        }.Concat(closestMetadata.SearchableTerms).Where(s => !string.IsNullOrEmpty(s)).ToArray();
+
         private string versionString => string.IsNullOrEmpty(DifficultyName) ? string.Empty : $"[{DifficultyName}]";
+
+        // temporary helper methods until we figure which metadata should be where.
+        private IBeatmapMetadataInfo closestMetadata => (Metadata ?? BeatmapSet.Metadata)!;
     }
 }