Rework config loading and include FallbackTemperature

Author: alex6dj

src/FanControl.StorageSpacePlugin/Config.cs

@@ -1,12 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.IO;
 
 namespace FanControl.StorageSpacePlugin
 {
     internal static class Config
     {
-        private static int _defaultRefreshRate = 30;
+        private static readonly Dictionary<string, Action<string>> ConfigActions = new Dictionary<string, Action<string>>();
+
+        static Config()
+        {
+            ConfigActions.Add(
+                ConfigValues.RefreshRateKey,
+                value =>
+                {
+                    var result = int.TryParse(value, out var refreshRate);
+                    _refreshRate = result ? refreshRate : Defaults.RefreshRateValue;
+                });
+
+            ConfigActions.Add(
+                ConfigValues.FallbackTemperatureKey,
+                value =>
+                {
+                    var result = float.TryParse(value, out var fallbackTemperature);
+                    _fallbackTemperature = result ? fallbackTemperature : Defaults.FallbackTemperatureValue;
+                });
+        }
 
         public static string ApplicationPath()
         {
@@ -24,13 +44,13 @@ public static string ConfigPath()
             return Path.Combine(PluginsPath(), "FanControl.StorageSpacePlugin.ini");
         }
 
-        public static int RefreshRate()
+        public static void ReadConfig()
         {
-            string configText;
+            string[] lines;
 
             try
             {
-                configText = File.ReadAllText(ConfigPath());
+                lines = File.ReadAllLines(ConfigPath());
             }
             catch (Exception exception)
             {
@@ -41,22 +61,44 @@ public static int RefreshRate()
                     case PathTooLongException _:
                     case IOException _:
                     case UnauthorizedAccessException _:
-                        return _defaultRefreshRate;
+                        return;
                     default:
                         throw; // Let FanControl handle and log the Exception
                 }
             }
 
-            var configsArray = configText.Split('=');
-
-            var result = int.TryParse(configsArray[1], out var refreshRate);
+            foreach (var line in lines)
+            {
+                var configsArray = line.Split('=');
 
-            return result ? refreshRate : _defaultRefreshRate;
+                if (configsArray.Length != 2)
+                {
+                    continue;
+                }
+                
+                if (ConfigActions.TryGetValue(configsArray[0], out var configUpdate))
+                {
+                    configUpdate.Invoke(configsArray[1]);
+                }
+            }
         }
 
+        private static int _refreshRate = Defaults.RefreshRateValue;
+        public static int RefreshRate => _refreshRate;
+
+        private static float _fallbackTemperature = Defaults.FallbackTemperatureValue;
+        public static float FallbackTemperature => _fallbackTemperature;
+
         public static class Defaults
         {
-            public static float FallbackTemperature => 36; // Default reported temperature in case of wrong PowerShell value
+            public static int RefreshRateValue => 30;
+            public static float FallbackTemperatureValue => 36; // Default reported temperature in case of wrong PowerShell value
+        }
+
+        public static class ConfigValues
+        {
+            public static string RefreshRateKey => "RefreshRate";
+            public static string FallbackTemperatureKey => "FallbackTemperature";
         }
     }
-}
+}

src/FanControl.StorageSpacePlugin/DisksInfoProvider.cs

@@ -26,7 +26,7 @@ public DisksInfoProvider()
         {
             _powerShellRunner = new PowerShellRunner();
 
-            var refreshRate = Config.RefreshRate();
+            var refreshRate = Config.RefreshRate;
 
             var autoUpdater = Observable.FromEvent<bool>(
                     eh => _autoUpdaterObserver += eh,
@@ -44,7 +44,7 @@ public DisksInfoProvider()
                     {
                         if (_disks.TryGetValue(serial, out var disk))
                         {
-                            disk.Temperature = temperature == 0 ? Config.Defaults.FallbackTemperature : temperature;
+                            disk.Temperature = temperature == 0 ? Config.FallbackTemperature : temperature;
                         }
                     }
                 });
@@ -143,7 +143,7 @@ private float GetTemperature(PowerShell ps, Disk disk)
                 }
             }
 
-            return 36;
+            return Config.Defaults.FallbackTemperatureValue;
         }
     }
 }

src/FanControl.StorageSpacePlugin/FanControl.StorageSpacePlugin.ini

@@ -1 +1,2 @@
-RefreshRate=30
+RefreshRate=30
+FallbackTemperature=36

src/FanControl.StorageSpacePlugin/PluginSensor.cs

@@ -22,7 +22,7 @@ public float? Value
             get
             {
                 var temperature = _disk.Temperature;
-                return temperature == 0 ? Config.Defaults.FallbackTemperature : temperature;
+                return temperature == 0 ? Config.FallbackTemperature : temperature;
             }
         }
 

src/FanControl.StorageSpacePlugin/StorageSpacePlugin.cs

@@ -9,6 +9,7 @@ public class StorageSpacePlugin : IPlugin
 
         public StorageSpacePlugin()
         {
+            Config.ReadConfig();
             _disksInfoProvider = new DisksInfoProvider();
             _disksInfoProvider.Initialize();
         }