Skip to content

Commit bc43f01

Browse files
BornToBeRootBornToBeRoot
committed
Filter fixed...
1 parent 3052918 commit bc43f01

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

‎Source/NETworkManager/ViewModels/ARPTableViewModel.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ public ARPTableViewModel(IDialogCoordinator instance)
186186
_isLoading = true;
187187
_dialogCoordinator = instance;
188188

189+
// Result view + search
189190
ARPInfoResultsView = CollectionViewSource.GetDefaultView(ARPInfoResults);
190191
ARPInfoResultsView.SortDescriptions.Add(new SortDescription(nameof(ARPInfo.IPAddressInt32), ListSortDirection.Ascending));
191192
ARPInfoResultsView.Filter = o =>
@@ -195,11 +196,9 @@ public ARPTableViewModel(IDialogCoordinator instance)
195196

196197
if (string.IsNullOrEmpty(Search))
197198
return true;
198-
199-
var filter = Search.Replace(" ", "").Replace("-", "").Replace(":", "");
200-
199+
201200
// Search by IPAddress and MACAddress
202-
return info.IPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.MACAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || (info.IsMulticast ? Resources.Localization.Strings.Yes : Resources.Localization.Strings.No).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1;
201+
return info.IPAddress.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.MACAddress.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || (info.IsMulticast ? Resources.Localization.Strings.Yes : Resources.Localization.Strings.No).IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1;
203202
};
204203

205204
AutoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults);

‎Source/NETworkManager/ViewModels/ConnectionsViewModel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,16 @@ public ConnectionsViewModel(IDialogCoordinator instance)
187187

188188
_dialogCoordinator = instance;
189189

190+
// Result view + search
190191
ConnectionResultsView = CollectionViewSource.GetDefaultView(ConnectionResults);
191192
ConnectionResultsView.SortDescriptions.Add(new SortDescription(nameof(ConnectionInfo.LocalIPAddressInt32), ListSortDirection.Ascending));
192193
ConnectionResultsView.Filter = o =>
193194
{
194195
if (string.IsNullOrEmpty(Search))
195196
return true;
196197

197-
var filter = Search.Replace(" ", "").Replace("-", "").Replace(":", "");
198-
199198
// Search by local/remote IP Address, local/remote Port, Protocol and State
200-
return o is ConnectionInfo info && (info.LocalIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.LocalPort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemoteIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemotePort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + info.TcpState.ToString(), LocalizationManager.Culture).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1);
199+
return o is ConnectionInfo info && (info.LocalIPAddress.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.LocalPort.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.RemoteIPAddress.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.RemotePort.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + info.TcpState.ToString(), LocalizationManager.Culture).IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1);
201200
};
202201

203202
AutoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults);

‎Source/NETworkManager/ViewModels/ListenersViewModel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ public ListenersViewModel(IDialogCoordinator instance)
187187

188188
_dialogCoordinator = instance;
189189

190+
// Result view + search
190191
ListenerResultsView = CollectionViewSource.GetDefaultView(ListenerResults);
191192
ListenerResultsView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.Protocol), ListSortDirection.Ascending));
192193
ListenerResultsView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.IPAddressInt32), ListSortDirection.Ascending));
@@ -199,10 +200,8 @@ public ListenersViewModel(IDialogCoordinator instance)
199200
if (string.IsNullOrEmpty(Search))
200201
return true;
201202

202-
var filter = Search.Replace(" ", "").Replace("-", "").Replace(":", "");
203-
204203
// Search by IP Address, Port and Protocol
205-
return info.IPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.Port.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1;
204+
return info.IPAddress.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.Port.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1;
206205
};
207206

208207
AutoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults);

0 commit comments

Comments
 (0)