From f39fd18a5dfc097c7cc5d97cdd259c139b0c53b6 Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sat, 11 Jun 2022 23:08:18 -0500
Subject: [PATCH] More changes to updating and reduce bandwidth interval

Updates are independent from the UI and the UI only updates with the system clock.

These changes were made so the UI will instantly be updated at the same time, instead of waiting for the result, which could take a while with the ping for example.
---
 Network Monitor/MainWindow.xaml              |  8 ++--
 Network Monitor/MonitorView.xaml             |  4 +-
 Network Monitor/MonitorView.xaml.cs          | 28 +++++++++++++-
 Network Monitor/Monitors/BandwidthMonitor.cs |  6 +--
 Network Monitor/Monitors/DummyMonitor.cs     |  1 +
 Network Monitor/Monitors/LatencyMonitor.cs   |  2 +-
 Network Monitor/Monitors/Monitor.cs          | 40 ++++----------------
 7 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/Network Monitor/MainWindow.xaml b/Network Monitor/MainWindow.xaml
index 3555031..44292b6 100644
--- a/Network Monitor/MainWindow.xaml	
+++ b/Network Monitor/MainWindow.xaml	
@@ -20,7 +20,7 @@
         UseLayoutRounding="True"
         FontFamily="Consolas"
         MouseDown="MainWindow_OnMouseDown"
-		PreviewMouseWheel="Window_PreviewMouseWheel"
+        PreviewMouseWheel="Window_PreviewMouseWheel"
         Closed="Window_OnClosed">
 	<Window.Style>
 		<Style TargetType="Window">
@@ -145,16 +145,16 @@
 
 			<ItemsControl.ItemTemplate>
 				<DataTemplate>
-					<root:MonitorView Width="{Binding ActualWidth, ElementName=DummyMonitor}" />
+					<root:MonitorView Monitor="{Binding}" Width="{Binding ActualWidth, ElementName=DummyMonitor}" />
 				</DataTemplate>
 			</ItemsControl.ItemTemplate>
 		</ItemsControl>
 
 		<!--  Hidden dummy monitor to preserve width  -->
 		<root:MonitorView Visibility="Hidden">
-			<root:MonitorView.DataContext>
+			<root:MonitorView.Monitor>
 				<monitors:DummyMonitor />
-			</root:MonitorView.DataContext>
+			</root:MonitorView.Monitor>
 		</root:MonitorView>
 	</Grid>
 </Window>
\ No newline at end of file
diff --git a/Network Monitor/MonitorView.xaml b/Network Monitor/MonitorView.xaml
index 1e1021c..2733328 100644
--- a/Network Monitor/MonitorView.xaml	
+++ b/Network Monitor/MonitorView.xaml	
@@ -4,7 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d">
-	<Grid>
+	<Grid DataContext="{Binding Monitor, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
 			<ColumnDefinition Width="*" SharedSizeGroup="Value" />
@@ -20,7 +20,7 @@
 		<Viewbox Grid.Column="1"
 		         StretchDirection="DownOnly"
 		         Margin="1,0,1,0">
-			<TextBlock Text="{Binding DisplayValue}" TextAlignment="Center" />
+			<TextBlock x:Name="DisplayTextBlock" TextAlignment="Center" />
 		</Viewbox>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Network Monitor/MonitorView.xaml.cs b/Network Monitor/MonitorView.xaml.cs
index df26c0e..3ae7472 100644
--- a/Network Monitor/MonitorView.xaml.cs	
+++ b/Network Monitor/MonitorView.xaml.cs	
@@ -1,4 +1,6 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
+using Network_Monitor.Monitors;
 
 namespace Network_Monitor;
 
@@ -7,8 +9,32 @@ namespace Network_Monitor;
 /// </summary>
 public partial class MonitorView : UserControl
 {
+    private readonly SystemClockTimer Timer = new();
+
+    public static readonly DependencyProperty MonitorProperty = DependencyProperty.Register(nameof(Monitor), typeof(Monitor), typeof(MonitorView), new(OnMonitorChanged));
+
     public MonitorView()
     {
         InitializeComponent();
     }
+
+    public Monitor Monitor
+    {
+        get => (Monitor)GetValue(MonitorProperty);
+        set => SetValue(MonitorProperty, value);
+    }
+
+    public static void OnMonitorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var view = (MonitorView)d;
+        var monitor = (Monitor)e.NewValue;
+
+        view.DisplayTextBlock.Text = monitor.DisplayValue;
+
+        view.Timer.SecondChanged += (_, _) =>
+        {
+            view.Dispatcher.Invoke(() => view.DisplayTextBlock.Text = monitor.DisplayValue);
+        };
+        view.Timer.Start();
+    }
 }
diff --git a/Network Monitor/Monitors/BandwidthMonitor.cs b/Network Monitor/Monitors/BandwidthMonitor.cs
index 8678b18..b3e8df5 100644
--- a/Network Monitor/Monitors/BandwidthMonitor.cs	
+++ b/Network Monitor/Monitors/BandwidthMonitor.cs	
@@ -12,12 +12,12 @@ public abstract class BandwidthMonitor : Monitor
     private readonly char[] ByteSuffixes = new[] { 'B', 'K', 'M', 'G', 'T', 'P', 'E' };
     private long _lastBytes;
 
-    protected abstract long GetTotalBytes();
-
-    protected BandwidthMonitor() : base(interval: TimeSpan.FromSeconds(1))
+    protected BandwidthMonitor() : base(TimeSpan.FromSeconds(2))
     {
     }
 
+    protected abstract long GetTotalBytes();
+
     protected override async Task<string> GetDisplayValueAsync()
     {
         var bytes = await Task.Run(() => GetBytesDiffAndUpdateLast());
diff --git a/Network Monitor/Monitors/DummyMonitor.cs b/Network Monitor/Monitors/DummyMonitor.cs
index 75d62bd..6ce9954 100644
--- a/Network Monitor/Monitors/DummyMonitor.cs	
+++ b/Network Monitor/Monitors/DummyMonitor.cs	
@@ -14,6 +14,7 @@ public DummyMonitor() : base(TimeSpan.Zero)
         Name = "You shouldn't be seeing this!";
         Icon = 'X';
         IconBrush = Brushes.Red;
+        DisplayValue = string.Empty.PadRight(4);
     }
 
     protected override Task<string> GetDisplayValueAsync() =>
diff --git a/Network Monitor/Monitors/LatencyMonitor.cs b/Network Monitor/Monitors/LatencyMonitor.cs
index 1a1f9bf..88b9c59 100644
--- a/Network Monitor/Monitors/LatencyMonitor.cs	
+++ b/Network Monitor/Monitors/LatencyMonitor.cs	
@@ -14,7 +14,7 @@ public class LatencyMonitor : Monitor
     private readonly string _host;
     private readonly int _timeout;
 
-    public LatencyMonitor(string host, TimeSpan timeout) : base(interval: timeout)
+    public LatencyMonitor(string host, TimeSpan timeout) : base(timeout)
     {
         Name = "Latency";
         Icon = '⟳';
diff --git a/Network Monitor/Monitors/Monitor.cs b/Network Monitor/Monitors/Monitor.cs
index c469dd7..e862d64 100644
--- a/Network Monitor/Monitors/Monitor.cs	
+++ b/Network Monitor/Monitors/Monitor.cs	
@@ -1,29 +1,18 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Media;
-using System.Windows.Threading;
 
 namespace Network_Monitor.Monitors;
 
-public abstract class Monitor : ObservableObject
+public abstract class Monitor
 {
-    private readonly SystemClockTimer _timer;
-    private string _displayValue = string.Empty.PadRight(4);
+    private readonly Timer _timer;
 
     protected Monitor(TimeSpan interval)
     {
-        var intervalSeconds = (int)interval.TotalSeconds;
-
-        if (intervalSeconds > 0)
-        {
-            _timer = new();
-            _timer.SecondChanged += async (_, _) =>
-            {
-                if (string.IsNullOrWhiteSpace(DisplayValue) || DateTime.Now.Second % intervalSeconds == 0)
-                    await UpdateAsync();
-            };
-            _timer.Start();
-        }
+        if (interval > TimeSpan.Zero)
+            _timer = new Timer(async _ => await UpdateAsync(), null, TimeSpan.Zero, interval);
     }
 
     /// <summary>
@@ -41,25 +30,10 @@ protected Monitor(TimeSpan interval)
     /// </summary>
     public Brush IconBrush { get; protected set; }
 
-    /// <summary>
-    /// Interval to update in seconds.
-    /// </summary>
-    public int IntervalSeconds { get; protected set; } = 5;
-
     /// <summary>
     /// User-friendly text to show in the UI.
     /// </summary>
-    public string DisplayValue
-    {
-        get => _displayValue;
-        private set
-        {
-            if (value == null || value.Length > 4)
-                throw new InvalidOperationException("Value can't be null or more than 4 characters.");
-
-            Set(ref _displayValue, value);
-        }
-    }
+    public string DisplayValue { get; protected set; }
 
     /// <summary>
     /// Gets the latest value for <see cref="DisplayValue" />.
@@ -69,7 +43,7 @@ private set
     /// <summary>
     /// Updates <see cref="DisplayValue"/> with the latest value.
     /// </summary>
-    public async Task UpdateAsync()
+    private async Task UpdateAsync()
     {
         try
         {