save settings after each change

Author: sergiye

GUI/MainForm.cs

@@ -48,7 +48,6 @@ public partial class MainForm : Form {
     private readonly UserOption logSensors;
     private readonly UserRadioGroup loggingInterval;
     private readonly Logger logger;
-    private readonly string configFilePath;
 
     private bool selectionDragging = false;
     //private readonly Timer checkUpdatesTimer;
@@ -61,8 +60,7 @@ public MainForm() {
 
       settings = new PersistentSettings();
 
-      configFilePath = Path.ChangeExtension(Application.ExecutablePath, ".config");
-      settings.Load(configFilePath);
+      settings.Load();
 
       unitManager = new UnitManager(settings);
 
@@ -283,7 +281,6 @@ public MainForm() {
       // Make sure the settings are saved when the user logs off
       Microsoft.Win32.SystemEvents.SessionEnded += delegate {
         computer.Close();
-        SaveConfiguration();
         if (runWebServer.Value)
           server.Quit();
       };
@@ -311,8 +308,7 @@ private void InsertSorted(Collection<Node> nodes, HardwareNode node) {
     }
 
     private void SubHardwareAdded(IHardware hardware, Node node) {
-      HardwareNode hardwareNode =
-        new HardwareNode(hardware, settings, unitManager);
+      var hardwareNode = new HardwareNode(hardware, settings, unitManager);
 
       InsertSorted(node.Nodes, hardwareNode);
 
@@ -378,27 +374,6 @@ private void timer_Tick(object sender, EventArgs e) {
         delayCount++;
     }
 
-    private void SaveConfiguration() {
-      if (settings == null)
-        return;
-
-      if (server != null) {
-        settings.SetValue("listenerPort", server.ListenerPort);
-      }
-
-      try {
-        settings.Save(configFilePath);
-      } catch (UnauthorizedAccessException) {
-        MessageBox.Show("Access to the path '" + configFilePath + "' is denied. " +
-          "The current settings could not be saved.",
-          "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-      } catch (IOException) {
-        MessageBox.Show("The path '" + configFilePath + "' is not writeable. " +
-          "The current settings could not be saved.",
-          "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-      }
-    }
-
     private void RestoreBoundsFromSettings() {
       Rectangle newBounds = new Rectangle {
         X = settings.GetValue("mainForm.Location.X", Location.X),
@@ -434,7 +409,6 @@ private void MainForm_FormClosed(object sender, FormClosedEventArgs e) {
       systemTray.IsMainIconEnabled = false;
       timer.Enabled = false;
       computer.Close();
-      SaveConfiguration();
       if (runWebServer.Value)
         server.Quit();
       systemTray.Dispose();
@@ -693,7 +667,9 @@ private void treeView_MouseUp(object sender, MouseEventArgs e) {
     }
 
     private void serverPortMenuItem_Click(object sender, EventArgs e) {
-      new PortForm(this).ShowDialog();
+      if (new PortForm(this.server).ShowDialog() == DialogResult.OK) {
+        settings.SetValue("listenerPort", server.ListenerPort);
+      }
     }
 
     public HttpServer Server {

GUI/PortForm.Designer.cs

@@ -3,27 +3,24 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Diagnostics;
+using OpenHardwareMonitor.Utilities;
 
 namespace OpenHardwareMonitor.GUI {
   public partial class PortForm : Form {
-    private MainForm parent;
-    private string localIP;
-    public PortForm(MainForm m) {
-      InitializeComponent();
-      parent = m;
+    private readonly HttpServer server;
+    private readonly string localIP;
 
+    public PortForm(HttpServer server) {
+      InitializeComponent();
+      this.server = server;
       localIP = getLocalIP();
     }
 
-    private void portTextBox_TextChanged(object sender, EventArgs e) {
-
-    }
-
     private string getLocalIP() {
       IPHostEntry host;
-      string localIP = "?";
+      var localIP = "?";
       host = Dns.GetHostEntry(Dns.GetHostName());
-      foreach (IPAddress ip in host.AddressList) {
+      foreach (var ip in host.AddressList) {
         if (ip.AddressFamily == AddressFamily.InterNetwork) {
           localIP = ip.ToString();
         }
@@ -32,23 +29,18 @@ private string getLocalIP() {
     }
 
     private void portNumericUpDn_ValueChanged(object sender, EventArgs e) {
-      string url = "http://" + localIP + ":" + portNumericUpDn.Value + "/";
+      var url = "http://" + localIP + ":" + portNumericUpDn.Value + "/";
       webServerLinkLabel.Text = url;
       webServerLinkLabel.Links.Remove(webServerLinkLabel.Links[0]);
       webServerLinkLabel.Links.Add(0, webServerLinkLabel.Text.Length, url);
     }
 
     private void portOKButton_Click(object sender, EventArgs e) {
-      parent.Server.ListenerPort = (int)portNumericUpDn.Value;
-      this.Close();
-    }
-
-    private void portCancelButton_Click(object sender, EventArgs e) {
-      this.Close();
+      server.ListenerPort = (int)portNumericUpDn.Value;
     }
 
     private void PortForm_Load(object sender, EventArgs e) {
-      portNumericUpDn.Value = parent.Server.ListenerPort;
+      portNumericUpDn.Value = server.ListenerPort;
       portNumericUpDn_ValueChanged(null, null);
     }
 

GUI/PortForm.cs

@@ -3,21 +3,28 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
+using System.Windows.Forms;
 using Microsoft.Win32;
 using OpenHardwareMonitor.Hardware;
 
 namespace OpenHardwareMonitor {
 
   public class PersistentSettings : ISettings {
 
+    private readonly string configFilePath;
+
+    public PersistentSettings() {
+      configFilePath = Path.ChangeExtension(Application.ExecutablePath, ".config");
+    }
+
     private IDictionary<string, string> settings = new Dictionary<string, string>();
 
-    public void Load(string fileName) {
+    public void Load() {
 
       //old versions configs compatibility
-      if (File.Exists(fileName)) {
+      if (File.Exists(configFilePath)) {
         try {
-          var json = File.ReadAllText(fileName);
+          var json = File.ReadAllText(configFilePath);
           settings = json.FromJson<IDictionary<string, string>>();
           return;
         }
@@ -35,7 +42,7 @@ public void Load(string fileName) {
       }
     }
 
-    public void Save(string fileName) {
+    public void Save() {
 
       try {
         //remove prev settings
@@ -48,16 +55,30 @@ public void Save(string fileName) {
           }
         }
 
-        if (File.Exists(fileName)) {
+        if (File.Exists(configFilePath)) {
           try {
-            File.Delete(fileName);
+            File.Delete(configFilePath);
           } catch (Exception) {
             //ignore
           }
         }
       } catch (Exception) {
         //save old-style config
-        settings.ToJsonFile(fileName);
+        SaveToFile();
+      }
+    }
+
+    public void SaveToFile() {
+      try {
+        settings.ToJsonFile(configFilePath);
+      } catch (UnauthorizedAccessException) {
+        MessageBox.Show("Access to the path '" + configFilePath + "' is denied. " +
+          "The current settings could not be saved.",
+          "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      } catch (IOException) {
+        MessageBox.Show("The path '" + configFilePath + "' is not writeable. " +
+          "The current settings could not be saved.",
+          "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
       }
     }
 
@@ -67,6 +88,7 @@ public bool Contains(string name) {
 
     public void SetValue(string name, string value) {
       settings[name] = value;
+      Save();
     }
 
     public string GetValue(string name, string defaultValue) {
@@ -75,10 +97,12 @@ public string GetValue(string name, string defaultValue) {
 
     public void Remove(string name) {
       settings.Remove(name);
+      Save();
     }
 
     public void SetValue(string name, int value) {
       settings[name] = value.ToString();
+      Save();
     }
 
     public int GetValue(string name, int defaultValue) {
@@ -89,6 +113,7 @@ public int GetValue(string name, int defaultValue) {
 
     public void SetValue(string name, float value) {
       settings[name] = value.ToString(CultureInfo.InvariantCulture);
+      Save();
     }
 
     public float GetValue(string name, float defaultValue) {
@@ -100,6 +125,7 @@ public float GetValue(string name, float defaultValue) {
 
     public void SetValue(string name, bool value) {
       settings[name] = value ? "true" : "false";
+      Save();
     }
 
     public bool GetValue(string name, bool defaultValue) {
@@ -110,6 +136,7 @@ public bool GetValue(string name, bool defaultValue) {
 
     public void SetValue(string name, Color color) {
       settings[name] = color.ToArgb().ToString("X8");
+      Save();
     }
 
     public Color GetValue(string name, Color defaultValue) {