AutoRefresh added, search improved

Author: BornToBeRoot

Source/NETworkManager/Models/Settings/SettingsInfo.cs

@@ -2191,6 +2191,36 @@ public AutoRefreshTimeInfo Listeners_AutoRefreshTime
         }
         #endregion
 
+        #region ARPTable
+        private bool _arpTable_AutoRefresh;
+        public bool ARPTable_AutoRefresh
+        {
+            get { return _arpTable_AutoRefresh; }
+            set
+            {
+                if (value == _arpTable_AutoRefresh)
+                    return;
+
+                _arpTable_AutoRefresh = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private AutoRefreshTimeInfo _arpTable_AutoRefreshTime = AutoRefreshTime.Defaults.First(x => (x.Value == 30 && x.TimeUnit == AutoRefreshTime.TimeUnit.Second));
+        public AutoRefreshTimeInfo ARPTable_AutoRefreshTime
+        {
+            get { return _arpTable_AutoRefreshTime; }
+            set
+            {
+                if (value == _arpTable_AutoRefreshTime)
+                    return;
+
+                _arpTable_AutoRefreshTime = value;
+                SettingsChanged = true;
+            }
+        }
+        #endregion
+
         #endregion
 
         #region Constructor

Source/NETworkManager/ViewModels/ARPTableViewModel.cs

@@ -9,6 +9,8 @@
 using NETworkManager.Views;
 using NETworkManager.Utilities;
 using NETworkManager.Models.Settings;
+using System.Windows.Threading;
+using System.Linq;
 
 namespace NETworkManager.ViewModels
 {
@@ -17,6 +19,9 @@ public class ARPTableViewModel : ViewModelBase
         #region Variables
         private IDialogCoordinator dialogCoordinator;
 
+        private bool _isLoading = true;
+        private DispatcherTimer _autoRefreshTimer = new DispatcherTimer();
+
         private string _search;
         public string Search
         {
@@ -68,6 +73,60 @@ public ARPTableInfo SelectedARPTableInfo
             }
         }
 
+        private bool _autoRefresh;
+        public bool AutoRefresh
+        {
+            get { return _autoRefresh; }
+            set
+            {
+                if (value == _autoRefresh)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.ARPTable_AutoRefresh = value;
+
+                _autoRefresh = value;
+
+                // Start timer to refresh automatically
+                if (!_isLoading)
+                {
+                    if (value)
+                        StartAutoRefreshTimer();
+                    else
+                        StopAutoRefreshTimer();
+                }
+
+                OnPropertyChanged();
+            }
+        }
+
+        private ICollectionView _autoRefreshTimes;
+        public ICollectionView AutoRefreshTimes
+        {
+            get { return _autoRefreshTimes; }
+        }
+
+        private AutoRefreshTimeInfo _selectedAutoRefreshTime;
+        public AutoRefreshTimeInfo SelectedAutoRefreshTime
+        {
+            get { return _selectedAutoRefreshTime; }
+            set
+            {
+                if (value == _selectedAutoRefreshTime)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.ARPTable_AutoRefreshTime = value;
+
+                _selectedAutoRefreshTime = value;
+
+                if (AutoRefresh)
+                    ChangeAutoRefreshTimerInterval(AutoRefreshTime.CalculateTimeSpan(value));
+
+                OnPropertyChanged();
+            }
+        }
+
         private bool _isRefreshing;
         public bool IsRefreshing
         {
@@ -128,10 +187,27 @@ public ARPTableViewModel(IDialogCoordinator instance)
                 string filter = Search.Replace(" ", "").Replace("-", "").Replace(":", "");
 
                 // Search by IPAddress and MACAddress
-                return info.IPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.MACAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1;
+                return info.IPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.MACAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || (info.IsMulticast ? LocalizationManager.GetStringByKey("String_Yes") : LocalizationManager.GetStringByKey("String_No")).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1;
             };
 
+            _autoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults);
+            SelectedAutoRefreshTime = AutoRefreshTimes.SourceCollection.Cast<AutoRefreshTimeInfo>().FirstOrDefault(x => (x.Value == SettingsManager.Current.ARPTable_AutoRefreshTime.Value && x.TimeUnit == SettingsManager.Current.ARPTable_AutoRefreshTime.TimeUnit));
+
+            _autoRefreshTimer.Tick += AutoRefreshTimer_Tick;
+
+            LoadSettings();
+
+            _isLoading = false;
+
             Refresh();
+
+            if (AutoRefresh)
+                StartAutoRefreshTimer();
+        }
+
+        private void LoadSettings()
+        {
+            AutoRefresh = SettingsManager.Current.ARPTable_AutoRefresh;
         }
         #endregion
 
@@ -288,6 +364,23 @@ private async void Refresh()
 
             IsRefreshing = false;
         }
+
+        private void ChangeAutoRefreshTimerInterval(TimeSpan timeSpan)
+        {
+            _autoRefreshTimer.Interval = timeSpan;
+        }
+
+        private void StartAutoRefreshTimer()
+        {
+            ChangeAutoRefreshTimerInterval(AutoRefreshTime.CalculateTimeSpan(SelectedAutoRefreshTime));
+
+            _autoRefreshTimer.Start();
+        }
+
+        private void StopAutoRefreshTimer()
+        {
+            _autoRefreshTimer.Stop();
+        }
         #endregion
 
         #region Events
@@ -296,6 +389,11 @@ private void ArpTable_UserHasCanceled(object sender, EventArgs e)
             StatusMessage = LocalizationManager.GetStringByKey("String_CanceledByUser");
             DisplayStatusMessage = true;
         }
+
+        private void AutoRefreshTimer_Tick(object sender, EventArgs e)
+        {
+            Refresh();
+        }
         #endregion
     }
 }

Source/NETworkManager/ViewModels/ConnectionsViewModel.cs

@@ -290,12 +290,7 @@ private async void Refresh()
             (await Connection.GetActiveTcpConnectionsAsync()).ForEach(x => Connections.Add(x));
 
             IsRefreshing = false;
-        }
-
-        private void AutoRefreshTimer_Tick(object sender, EventArgs e)
-        {
-            Refresh();
-        }
+        }         
 
         private void ChangeAutoRefreshTimerInterval(TimeSpan timeSpan)
         {
@@ -314,5 +309,12 @@ private void StopAutoRefreshTimer()
             _autoRefreshTimer.Stop();
         }
         #endregion
+
+        #region Events
+        private void AutoRefreshTimer_Tick(object sender, EventArgs e)
+        {
+            Refresh();
+        }
+        #endregion
     }
 }