Reformat code, fix CPU clock (use max of core clocks, ignore effective clocks)

Author: mathoudebine

external/LibreHardwareMonitor/test_librehardwaremonitor.py

@@ -1,9 +1,10 @@
 # Use this file to display all hardware & sensors available from LibreHardwareMonitor on your computer
 # Windows only - needs administrative rights
 import ctypes
-import sys
-import clr
 import os
+import sys
+
+import clr  # Clr is from pythonnet package. Do not install clr package
 from win32api import *
 
 if ctypes.windll.shell32.IsUserAnAdmin() == 0:
@@ -32,8 +33,8 @@
 ms_file_version = File_information['FileVersionMS']
 ls_file_version = File_information['FileVersionLS']
 print("Found HidSharp %s" % ".".join([str(HIWORD(ms_file_version)), str(LOWORD(ms_file_version)),
-                                                     str(HIWORD(ls_file_version)),
-                                                     str(LOWORD(ls_file_version))]))
+                                      str(HIWORD(ls_file_version)),
+                                      str(LOWORD(ls_file_version))]))
 
 handle = Hardware.Computer()
 handle.IsCpuEnabled = True

library/sensors/sensors.py

@@ -1,3 +1,6 @@
+# This file defines all supported hardware in virtual classes and their abstract methods to access sensors
+# To be overriden by child sensors classes
+
 from abc import ABC, abstractmethod
 from typing import Tuple
 
@@ -83,5 +86,6 @@ def disk_free() -> int:  # In bytes
 class Net(ABC):
     @staticmethod
     @abstractmethod
-    def stats(if_name, interval) -> Tuple[int, int, int, int]:  # up rate (B/s), uploaded (B), dl rate (B/s), downloaded (B)
+    def stats(if_name, interval) -> Tuple[
+        int, int, int, int]:  # up rate (B/s), uploaded (B), dl rate (B/s), downloaded (B)
         pass

library/sensors/sensors_librehardwaremonitor.py

@@ -1,13 +1,16 @@
-import clr  # from pythonnet package, not clr package !
+# This file will use LibreHardwareMonitor.dll library to get hardware sensors
+# Some metrics are still fetched by psutil when not available on LibreHardwareMonitor
+# For Windows platforms only
+
 import ctypes
 import math
 import os
 import sys
 from typing import Tuple
-from statistics import mean
-from win32api import *
 
+import clr  # Clr is from pythonnet package. Do not install clr package
 import psutil
+from win32api import *
 
 import library.sensors.sensors as sensors
 from library.log import logger
@@ -99,9 +102,12 @@ def frequency() -> float:
         frequencies = []
         cpu = get_hw_and_update(Hardware.HardwareType.Cpu)
         for sensor in cpu.Sensors:
-            if sensor.SensorType == Hardware.SensorType.Clock and "Core #" in str(sensor.Name):
-                frequencies.append(float(sensor.Value))
-        return mean(frequencies)
+            if sensor.SensorType == Hardware.SensorType.Clock:
+                # Keep only real core clocks, ignore effective core clocks
+                if "Core #" in str(sensor.Name) and "Effective" not in str(sensor.Name):
+                    frequencies.append(float(sensor.Value))
+        # Take the highest core clock as "CPU clock"
+        return max(frequencies)
 
     @staticmethod
     def load() -> Tuple[float, float, float]:  # 1 / 5 / 15min avg:

library/sensors/sensors_python.py

@@ -1,3 +1,6 @@
+# This file will use Python libraries (psutil, GPUtil, etc.) to get hardware sensors
+# For all platforms (Linux, Windows, macOS) but not all HW is supported
+
 import math
 from typing import Tuple
 from enum import IntEnum, auto

library/sensors/sensors_stub.py

@@ -1,5 +1,8 @@
-from typing import Tuple
+# This file will use randomly generated data instead of real hardware sensors
+# For all platforms (Linux, Windows, macOS)
+
 import random
+from typing import Tuple
 
 import library.sensors.sensors as sensors
 

library/stats.py

@@ -176,7 +176,6 @@ def temperature():
                                                THEME_DATA['STATS']['CPU']['TEMPERATURE']['TEXT'].get("BACKGROUND_IMAGE",
                                                                                                      None))
             )
-        # TODO: Built in function for *nix in psutil, for Windows can use WMI or a third party library
 
 
 def display_gpu_stats(load, memory_percentage, memory_used_mb, temperature):