[#5] : disk configuration

oliver254 · oliver254 · commit b3df2b81f62d · 2019-05-04T18:30:47.000+02:00
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
-# MachineMonitor
+# Machine Monitor
 [![Build status](https://monbsoft.visualstudio.com/MachineMonitor/_apis/build/status/MachineMonitor-CI)](https://monbsoft.visualstudio.com/MachineMonitor/_build/latest?definitionId=5)
 
 Machine Monitor is a system monitor to display resources and performances of your machine (CPU, Memory and GPU). 
 
+![alt text](doc/capture.jpg "Machine Monitor")
 
 ## Credits
 * [windows-toolkit/WindowsCommunityToolkit](https://github.com/windows-toolkit/WindowsCommunityToolkit), The Windows Community Toolkit is a collection of helper functions, custom controls, and app services. 
diff --git a/doc/capture.png b/doc/capture.png
diff --git a/src/MachineMonitor/App.config b/src/MachineMonitor/App.config
@@ -25,6 +25,9 @@
       <setting name="Transparent" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="Disk" serializeAs="String">
+        <value>_Total</value>
+      </setting>
     </Monbsoft.MachineMonitor.Properties.Settings>
     <Monbsoft.MachineMonitor.Settings>
       <setting name="Network" serializeAs="String">
diff --git a/src/MachineMonitor/Configuration/ConfigurationStore.cs b/src/MachineMonitor/Configuration/ConfigurationStore.cs
@@ -1,14 +1,22 @@
 ﻿using Monbsoft.MachineMonitor.Properties;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monbsoft.MachineMonitor.Configuration
 {
     public class ConfigurationStore
     {
+        public string Disk
+        {
+            get
+            {
+                return Settings.Default.Disk;
+            }
+            set
+            {
+                Settings.Default.Disk = value;
+                Save();
+            }
+        }
+
         public string Network
         {
             get
@@ -40,4 +48,4 @@ private void Save()
             Settings.Default.Save();
         }
     }
-}
+}
diff --git a/src/MachineMonitor/MachineMonitor.csproj b/src/MachineMonitor/MachineMonitor.csproj
@@ -72,6 +72,7 @@
     </ApplicationDefinition>
     <Compile Include="Configuration\ConfigurationStore.cs" />
     <Compile Include="Messages\UpdatedConfigurationMessage.cs" />
+    <Compile Include="Services\DiskService.cs" />
     <Compile Include="Services\NetworkService.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/src/MachineMonitor/Messages/UpdatedConfigurationMessage.cs b/src/MachineMonitor/Messages/UpdatedConfigurationMessage.cs
@@ -13,8 +13,9 @@ public UpdatedConfigurationMessage(ChangedType type)
 
         public enum ChangedType
         {
-            Network,
-            Transparent
+            Disk = 0,
+            Network = 1,
+            Transparent = 2
         }
 
         public ChangedType Changed { get; set; }
diff --git a/src/MachineMonitor/Properties/Settings.Designer.cs b/src/MachineMonitor/Properties/Settings.Designer.cs
diff --git a/src/MachineMonitor/Properties/Settings.settings b/src/MachineMonitor/Properties/Settings.settings
@@ -8,5 +8,8 @@
     <Setting Name="Transparent" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="Disk" Type="System.String" Scope="User">
+      <Value Profile="(Default)">_Total</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/src/MachineMonitor/Services/DiskService.cs b/src/MachineMonitor/Services/DiskService.cs
@@ -0,0 +1,18 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Monbsoft.MachineMonitor.Services
+{
+    public class DiskService
+    {
+        public List<string> GetDisks()
+        {
+            var category = new PerformanceCounterCategory("PhysicalDisk");
+            return category.GetInstanceNames().OrderBy(i => i).ToList();
+        }
+    }
+}
diff --git a/src/MachineMonitor/ViewModels/ConfigurationViewModel.cs b/src/MachineMonitor/ViewModels/ConfigurationViewModel.cs
@@ -13,28 +13,60 @@ public class ConfigurationViewModel : ViewModelBase
     {
         #region Champs
         private readonly ConfigurationStore _configuration;
-        private readonly NetworkService _networkService;
+        private string _disk;
         private string _network;
         private bool _transparent;
         #endregion
 
         #region Constructeurs
-        public ConfigurationViewModel(ConfigurationStore configuration, NetworkService networkService)
+        public ConfigurationViewModel(
+            ConfigurationStore configuration,
+            NetworkService networkService,
+            DiskService diskService)
         {
             _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
-            _networkService = networkService ?? throw new ArgumentNullException(nameof(networkService));
-            Networks = _networkService.GetNetworks();
+            if (networkService == null)
+            {
+                throw new ArgumentNullException(nameof(networkService));
+            }
+            if (diskService == null)
+            {
+                throw new ArgumentNullException(nameof(diskService));
+            }
+
+            Networks = networkService.GetNetworks();
+            Disks = diskService.GetDisks();
+            _disk = _configuration.Disk;
             _network = _configuration.Network;
             _transparent = _configuration.Transparent;
         }
         #endregion
 
         #region Propriétés
+        public List<string> Disks
+        {
+            get;
+            private set;
+        }
         public List<string> Networks
         {
             get;
             private set;
         }
+
+        public string SelectedDisk
+        {
+            get
+            {
+                return _disk;
+            }
+            set
+            {
+                Set(ref _disk, value);
+                Disk_Changed();
+            }
+        }
+
         public string SelectedNetwork
         {
             get { return _network; }
@@ -62,7 +94,11 @@ public bool Transparent
         private static void SendMessage(ChangedType type)
         {
             Messenger.Default.Send<UpdatedConfigurationMessage>(new UpdatedConfigurationMessage(type));
-
+        }
+        private void Disk_Changed()
+        {
+            _configuration.Disk = SelectedDisk;
+            SendMessage(ChangedType.Disk);
         }
         private void Network_Changed()
         {
@@ -77,4 +113,4 @@ private void Transparent_Changed()
         }
         #endregion
     }
-}
+}
diff --git a/src/MachineMonitor/ViewModels/MainViewModel.cs b/src/MachineMonitor/ViewModels/MainViewModel.cs
@@ -3,7 +3,9 @@
 using Monbsoft.MachineMonitor.Configuration;
 using Monbsoft.MachineMonitor.Messages;
 using Monbsoft.MachineMonitor.Views;
+using System;
 using System.Diagnostics;
+using System.Windows.Threading;
 using static Monbsoft.MachineMonitor.Messages.UpdatedConfigurationMessage;
 
 namespace Monbsoft.MachineMonitor.ViewModels
@@ -13,11 +15,12 @@ public class MainViewModel : ViewModelBase
         #region Champs
         private readonly ConfigurationStore _configuration;
         private readonly PerformanceCounter _cpuCounter;
-        private readonly PerformanceCounter _diskCounter;
         private readonly PerformanceCounter _memoryCounter;
         private readonly PerformanceCounter _networkCounter;
+        private readonly DispatcherTimer _timer;
         private double _cpu;
         private double _disk;
+        private PerformanceCounter _diskCounter;
         private double _network;
         private double _networkMax;
         private double _ram;
@@ -30,18 +33,23 @@ public class MainViewModel : ViewModelBase
         /// </summary>
         public MainViewModel(ConfigurationStore configuration)
         {
+            _configuration = configuration;
             _cpuCounter = new PerformanceCounter("Processor", "% Processor Time", "_Total");
             _memoryCounter = new PerformanceCounter("Memory", "% Committed Bytes In Use");
-            _diskCounter = new PerformanceCounter("PhysicalDisk", "% Disk Read Time", "_Total");
 
             if (configuration != null && !string.IsNullOrEmpty(configuration.Network))
             {
                 _networkCounter = new PerformanceCounter("Network Interface", "Bytes Received/sec", configuration.Network);
             }
-            _configuration = configuration;
+
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromMilliseconds(500);
+            _timer.Tick += Timer_Tick;
 
             // messages
             Messenger.Default.Register<UpdatedConfigurationMessage>(this, HandleUpdatedConfiguration);
+
+            OnDiskChange();
         }
         #endregion
 
@@ -90,14 +98,10 @@ public void Initialize(MainWindow view)
             _view = view;
             OnTransparencyChange(_configuration.Transparent);
         }
-        public void Refresh()
+        public void Start()
         {
-            Cpu = _cpuCounter.NextValue();
-            Ram = _memoryCounter.NextValue();
-            Disk = _diskCounter.NextValue();
-            Network = GetPercentageNetwork();
+            _timer.Start();
         }
-
         private double GetPercentageNetwork()
         {
             if (_networkCounter == null)
@@ -113,10 +117,31 @@ private double GetPercentageNetwork()
         }
         private void HandleUpdatedConfiguration(UpdatedConfigurationMessage updatedMessage)
         {
-            if (updatedMessage.Changed == ChangedType.Transparent)
+            _timer.Stop();
+            switch(updatedMessage.Changed)
             {
-                OnTransparencyChange(_configuration.Transparent);
+                case ChangedType.Disk:
+                    {
+                        OnDiskChange();
+                        break;
+                    }
+                case ChangedType.Transparent:
+                    {
+                        OnTransparencyChange(_configuration.Transparent);
+                        break;
+                    }
+                    
+                default:
+                    {
+                        break;
+                    }
             }
+            _timer.Start();
+
+        }
+        private void OnDiskChange()
+        {
+            _diskCounter = new PerformanceCounter("PhysicalDisk", "% Disk Time",_configuration.Disk);
         }
         private void OnTransparencyChange(bool transparent)
         {
@@ -129,6 +154,13 @@ private void OnTransparencyChange(bool transparent)
                 _view.DeactiveTransparency();
             }
         }
+        private void Timer_Tick(object sender, EventArgs e)
+        {
+            Cpu = _cpuCounter.NextValue();
+            Ram = _memoryCounter.NextValue();
+            Disk = _diskCounter.NextValue();
+            Network = GetPercentageNetwork();
+        }
         #endregion
     }
 }
diff --git a/src/MachineMonitor/ViewModels/ViewModelLocator.cs b/src/MachineMonitor/ViewModels/ViewModelLocator.cs
@@ -39,6 +39,7 @@ public ViewModelLocator()
             ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);           
             SimpleIoc.Default.Register<ConfigurationStore>();
             SimpleIoc.Default.Register<NetworkService>();
+            SimpleIoc.Default.Register<DiskService>();        
             SimpleIoc.Default.Register<MainViewModel>();
             SimpleIoc.Default.Register<ConfigurationViewModel>();
         }
diff --git a/src/MachineMonitor/Views/ConfigurationWindow.xaml b/src/MachineMonitor/Views/ConfigurationWindow.xaml
@@ -6,7 +6,10 @@
         mc:Ignorable="d"
         Title="Configuration"
         Background="{StaticResource SystemControlBackgroundBrush}"
-        WindowStartupLocation="CenterScreen" Width="400" Height="200">
+        Height="200" 
+        ShowInTaskbar="False"
+        Width="400" 
+        WindowStartupLocation="CenterScreen">
     <Grid Margin="5,0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="120"/>
@@ -17,30 +20,41 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>            
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <TextBlock Style="{StaticResource TextBlockStyle}"
-                   Text="Réseau:"/>
+                   Text="Disque:"/>
         <ComboBox Grid.Column="1"
                   Grid.Row="1"
                   HorizontalAlignment="Left"
+                  ItemsSource="{Binding Disks}"
+                  SelectedItem="{Binding SelectedDisk}"
+                  Width="150"/>
+        <TextBlock Grid.Row="2"
+                   Style="{StaticResource TextBlockStyle}"
+                   Text="Réseau:"/>
+        <ComboBox Grid.Column="1"
+                  Grid.Row="3"
+                  HorizontalAlignment="Left"
                   ItemsSource="{Binding Networks}"
                   SelectedItem="{Binding SelectedNetwork}"
                   Width="150">
         </ComboBox>
-        <TextBlock Grid.Row="2"
+        <TextBlock Grid.Row="4"
                    Style="{StaticResource TextBlockStyle}"
                    Text="Transparence:"/>
         <CheckBox Grid.Column="1"
-                  Grid.Row="3"
+                  Grid.Row="5"
                   IsChecked="{Binding Transparent}"/>
         <Button x:Name="closeButton" 
                 Click="CloseButton_Click"
                 Content="Fermer"
                 HorizontalAlignment="Center"
                 Grid.ColumnSpan="2"
-                Grid.Row="5"
+                Grid.Row="7"
                 Margin="5"
                 Padding="5" />
     </Grid>
diff --git a/src/MachineMonitor/Views/MainWindow.xaml.cs b/src/MachineMonitor/Views/MainWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@ public UpdatedConfigurationMessage(ChangedType type)`
`13`	`13`
`14`	`14`	`public enum ChangedType`
`15`	`15`	`{`
`16`		`- Network,`
`17`		`- Transparent`
	`16`	`+ Disk = 0,`
	`17`	`+ Network = 1,`
	`18`	`+ Transparent = 2`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public ChangedType Changed { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public ViewModelLocator()`
`39`	`39`	`ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);`
`40`	`40`	`SimpleIoc.Default.Register<ConfigurationStore>();`
`41`	`41`	`SimpleIoc.Default.Register<NetworkService>();`
	`42`	`+ SimpleIoc.Default.Register<DiskService>();`
`42`	`43`	`SimpleIoc.Default.Register<MainViewModel>();`
`43`	`44`	`SimpleIoc.Default.Register<ConfigurationViewModel>();`
`44`	`45`	`}`