Merge pull request #31 from gerph/safer-stats-on-macos

Safer stats on macos / Fix for theme values

Author: mathoudebine

library/stats.py

@@ -2,9 +2,10 @@
 
 import GPUtil
 import psutil
-
-if os.name == 'posix':
+try:
     import pyamdgpuinfo
+except ImportError:
+    pyamdgpuinfo = None
 
 import library.config as config
 from library.display import display
@@ -133,11 +134,14 @@ def load():
 
     @staticmethod
     def is_temperature_available():
-        if os.name == 'posix':
+        try:
             if 'coretemp' in psutil.sensors_temperatures() or 'k10temp' in psutil.sensors_temperatures():
                 return True
-
-        return False
+            else:
+                return False
+        except AttributeError:
+            # sensors_temperatures may not be available at all
+            return False
 
     @staticmethod
     def temperature():
@@ -299,7 +303,9 @@ def stats():
 
     @staticmethod
     def is_available():
-        return os.name == 'posix' and pyamdgpuinfo.detect_gpus() > 0
+        if not pyamdgpuinfo:
+            return False
+        return pyamdgpuinfo.detect_gpus() > 0
 
 
 class Memory:

res/themes/3.5inchTheme2_theme/theme.yaml

@@ -4,7 +4,7 @@ display:
   DISPLAY_ORIENTATION: portrait
 
   # Backplate RGB LED color (for HW revision 'flagship' devices only)
-  DISPLAY_RGB_LED: 0, 0, 255
+  DISPLAY_RGB_LED: [0, 0, 255]
 
 static_images:
   # Specify what static images we want to show on the display
@@ -298,4 +298,4 @@ STATS:
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
-        # BACKGROUND_IMAGE: background.png
+        # BACKGROUND_IMAGE: background.png