Merge pull request #22 from Tadelsucht/master

Ubuntu 20.04 Battery fix
Jinjinov · Apr 29, 2022 · 2b6c65f · 2b6c65f
2 parents b5e1512 + 7b2656a
commit 2b6c65f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Hardware.Info/HardwareInfoBase.cs b/Hardware.Info/HardwareInfoBase.cs
@@ -52,6 +52,21 @@ internal static string TryReadFileText(string path)
             }
         }
 
+        internal static bool TryReadIntegerFromFileText(out uint value, params string[] possiblePaths)
+        {
+            foreach(var path in possiblePaths)
+            {
+                string data = TryReadFileText(path);
+                if(uint.TryParse(data, out uint integer))
+                {
+                    value = integer;
+                    return true;
+                }
+            }
+            value = 0;
+            return false;
+        }
+
         internal static string[] TryReadFileLines(string path)
         {
             try

diff --git a/Hardware.Info/Linux/HardwareInfoRetrieval.cs b/Hardware.Info/Linux/HardwareInfoRetrieval.cs
@@ -68,15 +68,10 @@ public List<Battery> GetBatteryList()
             // /sys/class/power_supply/BAT0/manufacturer = Sony Corp.
             // /sys/class/power_supply/BAT0/serial_number = 
 
-            string power_now = TryReadFileText("/sys/class/power_supply/BAT0/power_now");
-            string energy_full_design = TryReadFileText("/sys/class/power_supply/BAT0/energy_full_design");
-            string energy_full = TryReadFileText("/sys/class/power_supply/BAT0/energy_full");
-            string energy_now = TryReadFileText("/sys/class/power_supply/BAT0/energy_now");
-
-            uint.TryParse(power_now, out uint powerNow);
-            uint.TryParse(energy_full_design, out uint designCapacity);
-            uint.TryParse(energy_full, out uint fullChargeCapacity);
-            uint.TryParse(energy_now, out uint energyNow);
+            TryReadIntegerFromFileText(out uint powerNow, "/sys/class/power_supply/BAT0/power_now", "/sys/class/power_supply/BAT0/voltage_now");
+            TryReadIntegerFromFileText(out uint designCapacity, "/sys/class/power_supply/BAT0/energy_full_design", "/sys/class/power_supply/BAT0/charge_full_design");
+            TryReadIntegerFromFileText(out uint fullChargeCapacity, "/sys/class/power_supply/BAT0/energy_full", "/sys/class/power_supply/BAT0/charge_full");
+            TryReadIntegerFromFileText(out uint energyNow, "/sys/class/power_supply/BAT0/energy_now", "/sys/class/power_supply/BAT0/charge_now");
 
             if (powerNow == 0)
                 powerNow = 1;