Merge pull request #500 from Nottrex/patch-1

Change SongSearch behaviour
UltraStar-Deluxe · Nov 6, 2024 · 361ec46 · 361ec46
2 parents af339af + 7bc069e
commit 361ec46
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/Search/SongSearchControl.cs b/UltraStar Play/Assets/Scenes/SongSelect/Search/SongSearchControl.cs
@@ -262,9 +262,14 @@ public List<SongMeta> GetFilteredSongMetas(List<SongMeta> songMetas)
         string searchText = GetRawSearchText() != "#"
             ? GetSearchText()
             : "";
+        if (searchText.IsNullOrEmpty()) {
+            return songMetas;
+        }
+        // Split searchText at whitespaces and match each word individually
+        string[] searchTexts = searchText.Split(new char[0], StringSplitOptions.RemoveEmptyEntries);
         List<SongMeta> filteredSongs = songMetas
-            .Where(songMeta => searchText.IsNullOrEmpty()
-                               || SongMetaMatchesSearchedProperties(songMeta, searchText))
+            .Where(songMeta => searchTexts.IsNullOrEmpty()
+                               || searchTexts.AllMatch(searchWord => SongMetaMatchesSearchedProperties(songMeta, searchWord)))
             .ToList();
         return filteredSongs;
     }