Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

fixed wildcard error in filter #150

AnoF-Cybera5797c93670a
diff --git a/Windows/gui/ViewModels/MainWindowViewModel.cs b/Windows/gui/ViewModels/MainWindowViewModel.cs
index 908d60e..2cb2873 100644
--- a/Windows/gui/ViewModels/MainWindowViewModel.cs
+++ b/Windows/gui/ViewModels/MainWindowViewModel.cs
@@ -902,13 +902,17 @@ public class MainWindowViewModel : ViewModelBase
private static bool ApplyFilterOperator(string fieldValue, string op, string filterValue)
{
+ bool hasWildcard = filterValue.Contains('*');
return op switch
{
- "Contains" => fieldValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
- "Not Contains" => !fieldValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
+ "Contains" => hasWildcard ? WildcardMatch(fieldValue, filterValue)
+ : fieldValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
+ "Not Contains" => hasWildcard ? !WildcardMatch(fieldValue, filterValue)
+ : !fieldValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
"Equals" => WildcardMatch(fieldValue, filterValue),
"Not Equals" => !WildcardMatch(fieldValue, filterValue),
- "Starts With" => fieldValue.StartsWith(filterValue, StringComparison.OrdinalIgnoreCase),
+ "Starts With" => hasWildcard ? WildcardMatch(fieldValue, filterValue)
+ : fieldValue.StartsWith(filterValue, StringComparison.OrdinalIgnoreCase),
_ => true
};
}