ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix negative matching on folders with no matches.

Browse source
This commit is contained in:
Ottermandias 2024-07-22 12:41:20 +02:00
parent cec28a1823
commit 1501bd4fbf
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Penumbra/UI/ModsTab/ModSearchStringSplitter.cs
View file

@ -95,9 +95,9 @@ public sealed class ModSearchStringSplitter : SearchStringSplitter<ModSearchType
} }
var fullName = folder.FullName(); var fullName = folder.FullName();
return Forced.All(i => MatchesName(i, folder.Name, fullName)) return Forced.All(i => MatchesName(i, folder.Name, fullName, false))
&& !Negated.Any(i => MatchesName(i, folder.Name, fullName)) && !Negated.Any(i => MatchesName(i, folder.Name, fullName, true))
&& (General.Count == 0 || General.Any(i => MatchesName(i, folder.Name, fullName))); && (General.Count == 0 || General.Any(i => MatchesName(i, folder.Name, fullName, false)));
} }
protected override bool Matches(Entry entry, ModFileSystem.Leaf leaf) protected override bool Matches(Entry entry, ModFileSystem.Leaf leaf)
@ -128,11 +128,11 @@ public sealed class ModSearchStringSplitter : SearchStringSplitter<ModSearchType
_ => true, _ => true,
}; };
private static bool MatchesName(Entry entry, ReadOnlySpan<char> name, ReadOnlySpan<char> fullName) private static bool MatchesName(Entry entry, ReadOnlySpan<char> name, ReadOnlySpan<char> fullName, bool defaultValue)
=> entry.Type switch => entry.Type switch
{ {
ModSearchType.Default => fullName.Contains(entry.Needle, StringComparison.OrdinalIgnoreCase), ModSearchType.Default => fullName.Contains(entry.Needle, StringComparison.OrdinalIgnoreCase),
ModSearchType.Name => name.Contains(entry.Needle, StringComparison.OrdinalIgnoreCase), ModSearchType.Name => name.Contains(entry.Needle, StringComparison.OrdinalIgnoreCase),
_ => false, _ => defaultValue,
}; };
} }