fix: Unable to search for deactivated characters in the character man…

…ager page
Moonholder · Nov 2, 2023 · 1f3ff34 · 1f3ff34
1 parent 691baa9
commit 1f3ff34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/GIMI-ModManager.Core/GamesService/GameService.cs b/src/GIMI-ModManager.Core/GamesService/GameService.cs
@@ -157,12 +157,17 @@ public Task<ICharacter> CreateCharacterAsync(string internalName, string display
 
 
     public Dictionary<ICharacter, int> QueryCharacters(string searchQuery,
-        IEnumerable<ICharacter>? restrictToCharacters = null, int minScore = 100)
+        IEnumerable<ICharacter>? restrictToCharacters = null, int minScore = 100,
+        bool includeDisabledCharacters = false)
     {
         var searchResult = new Dictionary<ICharacter, int>();
         searchQuery = searchQuery.ToLower().Trim();
 
-        foreach (var character in restrictToCharacters ?? GetCharacters())
+        var charactersToSearch = restrictToCharacters ?? (includeDisabledCharacters
+            ? GetCharacters().Concat(GetDisabledCharacters())
+            : GetCharacters()).AsEnumerable();
+
+        foreach (var character in charactersToSearch)
         {
             var loweredDisplayName = character.DisplayName.ToLower();
 

diff --git a/src/GIMI-ModManager.Core/GamesService/IGameService.cs b/src/GIMI-ModManager.Core/GamesService/IGameService.cs
@@ -34,7 +34,8 @@ public Task<ICharacter> CreateCharacterAsync(string internalName, string display
     public IModdableObject? GetModdableObjectByIdentifier(InternalName internalName);
 
     public Dictionary<ICharacter, int> QueryCharacters(string searchQuery,
-        IEnumerable<ICharacter>? restrictToCharacters = null, int minScore = 100);
+        IEnumerable<ICharacter>? restrictToCharacters = null, int minScore = 100,
+        bool includeDisabledCharacters = false);
 
     public List<IGameElement> GetElements();
 

diff --git a/src/GIMI-ModManager.WinUI/ViewModels/CharacterManagerViewModel.cs b/src/GIMI-ModManager.WinUI/ViewModels/CharacterManagerViewModel.cs
@@ -105,7 +105,8 @@ public void OnSearchTextChanged(string query)
         }
 
 
-        var suitableCharacters = _gameService.QueryCharacters(query, minScore: 100).OrderByDescending(kv => kv.Value)
+        var suitableCharacters = _gameService.QueryCharacters(query, minScore: 100, includeDisabledCharacters: true)
+            .OrderByDescending(kv => kv.Value)
             .ToArray();
 
         if (suitableCharacters.Length == 0)