Detect if not run as admin, minor fixes

Author: mathoudebine

.github/workflows/system-monitor-windows.yml

@@ -34,6 +34,9 @@ jobs:
         echo "Using theme ${{ matrix.theme }}"
         (Get-Content config.yaml) -replace "^  THEME.*$","  THEME: ${{ matrix.theme }}" | Set-Content  config.yaml
 
+        # For tests do not use LibreHardwareMonitor as it needs admin rights
+        (Get-Content config.yaml) -replace "^  HW_SENSORS.*$","  HW_SENSORS: PYTHON" | Set-Content  config.yaml
+
     - name: Run system monitor for 20 seconds
       run: |
         Start-Process -NoNewWindow python3 main.py -RedirectStandardOutput output.log -RedirectStandardError error.log

.gitignore

@@ -137,3 +137,5 @@ dmypy.json
 # Simulated display capture
 screencap.png
 tmp
+
+external/LibreHardwareMonitor/LibreHardwareMonitorLib.sys

config.yaml

@@ -15,10 +15,10 @@ config:
 
   # Hardware sensors reading
   # Choose the appropriate method for reading your hardware sensors:
-  # - PYTHON use Python libraries (psutils, GPUtil...) to read hardware sensors (supports all OS but not all HW)
-  # - LHM    use LibreHardwareMonitor library to read hardware sensors (Windows only)
-  # - STUB   use fake random data instead of real hardware sensors
-  # - AUTO   use the best method based on your OS: Windows OS will use LHM, other OS will use Python libraries
+  # - PYTHON  use Python libraries (psutils, GPUtil...) to read hardware sensors (supports all OS but not all HW)
+  # - LHM     use LibreHardwareMonitor library to read hardware sensors (Windows only - NEEDS ADMIN RIGHTS)
+  # - STUB    use fake random data instead of real hardware sensors
+  # - AUTO    use the best method based on your OS: Windows OS will use LHM, other OS will use Python libraries
   HW_SENSORS: AUTO
 
   # Network interfaces

library/sensors/sensors_librehardwaremonitor.py

@@ -1,6 +1,8 @@
 import clr  # from pythonnet package, not clr package !
+import ctypes
 import math
 import os
+import sys
 from typing import Tuple
 from statistics import mean
 from win32api import *
@@ -26,6 +28,15 @@
                                                             str(HIWORD(ls_file_version)),
                                                             str(LOWORD(ls_file_version))]))
 
+if ctypes.windll.shell32.IsUserAnAdmin() == 0:
+    logger.error(
+        "Program is not running as administrator. Please run with admin rights or choose another HW_SENSORS option in "
+        "config.yaml")
+    try:
+        sys.exit(0)
+    except:
+        os._exit(0)
+
 handle = Hardware.Computer()
 handle.IsCpuEnabled = True
 handle.IsGpuEnabled = True
@@ -66,7 +77,7 @@ def get_net_interface_and_update(if_name: str) -> Hardware.Hardware:
             hardware.Update()
             return hardware
 
-    logger.error("Network interface '%s' not found. Check names in config.yaml." % if_name)
+    logger.warning("Network interface '%s' not found. Check names in config.yaml." % if_name)
     return None
 
 
@@ -86,7 +97,7 @@ def frequency() -> float:
         frequencies = []
         cpu = get_hw_and_update(Hardware.HardwareType.Cpu)
         for sensor in cpu.Sensors:
-            if sensor.SensorType == Hardware.SensorType.Clock and str(sensor.Name).startswith("CPU Core #"):
+            if sensor.SensorType == Hardware.SensorType.Clock and "Core #" in str(sensor.Name):
                 frequencies.append(float(sensor.Value))
         return mean(frequencies)
 
@@ -100,11 +111,9 @@ def is_temperature_available() -> bool:
         cpu = get_hw_and_update(Hardware.HardwareType.Cpu)
         for sensor in cpu.Sensors:
             if sensor.SensorType == Hardware.SensorType.Temperature:
-                if str(sensor.Name).startswith("Core Average") or str(sensor.Name).startswith("Core Max") or str(
-                        sensor.Name).startswith("CPU Package"):
+                if str(sensor.Name).startswith("Core") or str(sensor.Name).startswith("CPU Package"):
                     return True
 
-        logger.error("CPU temperature cannot be read")
         return False
 
     @staticmethod
@@ -118,10 +127,14 @@ def temperature() -> float:
         for sensor in cpu.Sensors:
             if sensor.SensorType == Hardware.SensorType.Temperature and str(sensor.Name).startswith("Core Max"):
                 return float(sensor.Value)
-        # Otherwise the CPU Package temperature (usually same as max core temperature) will be used
+        # If not available, the CPU Package temperature (usually same as max core temperature) will be used
         for sensor in cpu.Sensors:
             if sensor.SensorType == Hardware.SensorType.Temperature and str(sensor.Name).startswith("CPU Package"):
                 return float(sensor.Value)
+        # Otherwise any sensor named "Core..." will be used
+        for sensor in cpu.Sensors:
+            if sensor.SensorType == Hardware.SensorType.Temperature and str(sensor.Name).startswith("Core"):
+                return float(sensor.Value)
 
         return math.nan
 
@@ -233,7 +246,8 @@ def disk_usage_percent() -> float:
             if sensor.SensorType == Hardware.SensorType.Load and str(sensor.Name).startswith("Used Space"):
                 return float(sensor.Value)
 
-        return math.nan
+        # Get this data from psutil if it is not available from LibreHardwareMonitor
+        return psutil.disk_usage("/").percent
 
     @staticmethod
     def disk_used() -> int:  # In bytes
@@ -251,25 +265,25 @@ class Net(sensors.Net):
     def stats(if_name, interval) -> Tuple[
         int, int, int, int]:  # up rate (B/s), uploaded (B), dl rate (B/s), downloaded (B)
 
-        dl_speed = 0
-        dl = 0
-        up_speed = 0
-        up = 0
+        upload_rate = 0
+        uploaded = 0
+        download_rate = 0
+        downloaded = 0
 
         if if_name != "":
             net_if = get_net_interface_and_update(if_name)
             if net_if is not None:
                 for sensor in net_if.Sensors:
                     if sensor.SensorType == Hardware.SensorType.Data and str(sensor.Name).startswith("Data Uploaded"):
-                        up = int(sensor.Value * 1000000000.0)
+                        uploaded = int(sensor.Value * 1000000000.0)
                     elif sensor.SensorType == Hardware.SensorType.Data and str(sensor.Name).startswith(
                             "Data Downloaded"):
-                        dl = int(sensor.Value * 1000000000.0)
+                        downloaded = int(sensor.Value * 1000000000.0)
                     elif sensor.SensorType == Hardware.SensorType.Throughput and str(sensor.Name).startswith(
                             "Upload Speed"):
-                        up_speed = int(sensor.Value)
+                        upload_rate = int(sensor.Value)
                     elif sensor.SensorType == Hardware.SensorType.Throughput and str(sensor.Name).startswith(
                             "Download Speed"):
-                        dl_speed = int(sensor.Value)
+                        download_rate = int(sensor.Value)
 
-        return up_speed, up, dl_speed, dl
+        return upload_rate, uploaded, download_rate, downloaded

library/sensors/sensors_python.py

@@ -254,10 +254,10 @@ def stats(if_name, interval) -> Tuple[
         # Get current counters
         pnic_after = psutil.net_io_counters(pernic=True)
 
-        upload_rate = math.nan
-        uploaded = math.nan
-        download_rate = math.nan
-        downloaded = math.nan
+        upload_rate = 0
+        uploaded = 0
+        download_rate = 0
+        downloaded = 0
 
         if if_name in pnic_after:
             try:
@@ -270,5 +270,7 @@ def stats(if_name, interval) -> Tuple[
                 pass
 
             PNIC_BEFORE.update({if_name: pnic_after[if_name]})
+        else:
+            logger.warning("Network interface '%s' not found. Check names in config.yaml." % if_name)
 
         return upload_rate, uploaded, download_rate, downloaded

requirements.txt

@@ -1,8 +1,8 @@
 # Python packages requirements
-Pillow~=9.2.0     # Image generation
+Pillow~=9.3.0     # Image generation
 pyserial~=3.5     # Serial linl to communicate with the display
 PyYAML~=6.0       # For themes files
-psutil~=5.9.2     # CPU / disk / network metrics
+psutil~=5.9.4     # CPU / disk / network metrics
 GPUtil~=1.4.0     # Nvidia GPU
 
 # Following packages are for AMD GPU on Linux