claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Filter] Fully enable regex matching

Browse Source
This commit is contained in:
Matt Nadareski
2017-02-08 20:51:05 -08:00
parent 6edaf6e709
commit e8bcad896e
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.Helper/Dats/Filter.cs
View File

@@ -469,19 +469,15 @@ namespace SabreTools.Helper.Dats
/// <param name="haystack">List to search for the value in</param>
/// <param name="needle">Value to search the list for</param>
/// <returns>True if the value could be found, false otherwise</returns>
/// <remarks>TODO: Add proper regex matching to all strings</remarks>
private bool FindValueInList(List<string> haystack, string needle, bool regex = false)
private bool FindValueInList(List<string> haystack, string needle)
{
bool found = false;
foreach (string straw in haystack)
{
if (!String.IsNullOrEmpty(straw))
{
// Pre-process the straw to make it regex-compatibile
string regexStraw = (!regex ? "^" + (straw.StartsWith("*") ? ".*" : "") + Regex.Escape(straw.Trim('*')) + (straw.EndsWith("*") ? ".*" : "") + "$" : straw);
// Check if a match is found with the regex
found |= Regex.IsMatch(needle, regexStraw, RegexOptions.IgnoreCase);
found |= Regex.IsMatch(needle, straw, RegexOptions.IgnoreCase);
}
}