Add line graph to more data: RAM, Disk and Network

Author: mathoudebine

library/scheduler.py

@@ -113,8 +113,8 @@ def CPUTemperature():
 @async_job("CPU_FanSpeed")
 @schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['FAN_SPEED'].get("INTERVAL", None)).total_seconds())
 def CPUFanSpeed():
-    """ Refresh the CPU Temperature """
-    # logger.debug("Refresh CPU Temperature")
+    """ Refresh the CPU Fan Speed """
+    # logger.debug("Refresh CPU Fan Speed")
     stats.CPU.fan_speed()
 
 

library/stats.py

@@ -518,18 +518,27 @@ def is_available():
 
 
 class Memory:
-    @staticmethod
-    def stats():
+    last_values_memory_swap = []
+    last_values_memory_virtual = []
+
+    @classmethod
+    def stats(cls):
         memory_stats_theme_data = config.THEME_DATA['STATS']['MEMORY']
 
         swap_percent = sensors.Memory.swap_percent()
+        save_last_value(swap_percent, cls.last_values_memory_swap,
+                        memory_stats_theme_data['SWAP']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         display_themed_progress_bar(memory_stats_theme_data['SWAP']['GRAPH'], swap_percent)
         display_themed_percent_radial_bar(memory_stats_theme_data['SWAP']['RADIAL'], swap_percent)
+        display_themed_line_graph(memory_stats_theme_data['SWAP']['LINE_GRAPH'], cls.last_values_memory_swap)
 
         virtual_percent = sensors.Memory.virtual_percent()
+        save_last_value(virtual_percent, cls.last_values_memory_virtual,
+                        memory_stats_theme_data['VIRTUAL']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         display_themed_progress_bar(memory_stats_theme_data['VIRTUAL']['GRAPH'], virtual_percent)
         display_themed_percent_radial_bar(memory_stats_theme_data['VIRTUAL']['RADIAL'], virtual_percent)
         display_themed_percent_value(memory_stats_theme_data['VIRTUAL']['PERCENT_TEXT'], virtual_percent)
+        display_themed_line_graph(memory_stats_theme_data['VIRTUAL']['LINE_GRAPH'], cls.last_values_memory_virtual)
 
         display_themed_value(
             theme_data=memory_stats_theme_data['VIRTUAL']['USED'],
@@ -552,17 +561,22 @@ def stats():
 
 
 class Disk:
-    @staticmethod
-    def stats():
+    last_values_disk_usage = []
+
+    @classmethod
+    def stats(cls):
         used = sensors.Disk.disk_used()
         free = sensors.Disk.disk_free()
 
         disk_theme_data = config.THEME_DATA['STATS']['DISK']
 
         disk_usage_percent = sensors.Disk.disk_usage_percent()
+        save_last_value(disk_usage_percent, cls.last_values_disk_usage,
+                        disk_theme_data['USED']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         display_themed_progress_bar(disk_theme_data['USED']['GRAPH'], disk_usage_percent)
         display_themed_percent_radial_bar(disk_theme_data['USED']['RADIAL'], disk_usage_percent)
         display_themed_percent_value(disk_theme_data['USED']['PERCENT_TEXT'], disk_usage_percent)
+        display_themed_line_graph(disk_theme_data['USED']['LINE_GRAPH'], cls.last_values_disk_usage)
 
         display_themed_value(
             theme_data=disk_theme_data['USED']['TEXT'],
@@ -585,25 +599,42 @@ def stats():
 
 
 class Net:
-    @staticmethod
-    def stats():
-        interval = config.THEME_DATA['STATS']['CPU']['PERCENTAGE'].get("INTERVAL", None)
-        upload_wlo, uploaded_wlo, download_wlo, downloaded_wlo = sensors.Net.stats(WLO_CARD, interval)
+    last_values_wlo_upload = []
+    last_values_wlo_download = []
+    last_values_eth_upload = []
+    last_values_eth_download = []
+
+    @classmethod
+    def stats(cls):
         net_theme_data = config.THEME_DATA['STATS']['NET']
+        interval = net_theme_data.get("INTERVAL", None)
+        upload_wlo, uploaded_wlo, download_wlo, downloaded_wlo = sensors.Net.stats(WLO_CARD, interval)
 
+        save_last_value(upload_wlo, cls.last_values_wlo_upload,
+                        net_theme_data['WLO']['UPLOAD']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         Net._show_themed_tax_rate(net_theme_data['WLO']['UPLOAD']['TEXT'], upload_wlo)
         Net._show_themed_total_data(net_theme_data['WLO']['UPLOADED']['TEXT'], uploaded_wlo)
+        display_themed_line_graph(net_theme_data['WLO']['UPLOAD']['LINE_GRAPH'], cls.last_values_wlo_upload)
 
+        save_last_value(download_wlo, cls.last_values_wlo_download,
+                        net_theme_data['WLO']['DOWNLOAD']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         Net._show_themed_tax_rate(net_theme_data['WLO']['DOWNLOAD']['TEXT'], download_wlo)
         Net._show_themed_total_data(net_theme_data['WLO']['DOWNLOADED']['TEXT'], downloaded_wlo)
+        display_themed_line_graph(net_theme_data['WLO']['DOWNLOAD']['LINE_GRAPH'], cls.last_values_wlo_download)
 
         upload_eth, uploaded_eth, download_eth, downloaded_eth = sensors.Net.stats(ETH_CARD, interval)
 
+        save_last_value(upload_eth, cls.last_values_eth_upload,
+                        net_theme_data['ETH']['UPLOAD']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         Net._show_themed_tax_rate(net_theme_data['ETH']['UPLOAD']['TEXT'], upload_eth)
         Net._show_themed_total_data(net_theme_data['ETH']['UPLOADED']['TEXT'], uploaded_eth)
+        display_themed_line_graph(net_theme_data['ETH']['UPLOAD']['LINE_GRAPH'], cls.last_values_eth_upload)
 
+        save_last_value(download_eth, cls.last_values_eth_download,
+                        net_theme_data['ETH']['DOWNLOAD']['LINE_GRAPH'].get("HISTORY_SIZE", DEFAULT_HISTORY_SIZE))
         Net._show_themed_tax_rate(net_theme_data['ETH']['DOWNLOAD']['TEXT'], download_eth)
         Net._show_themed_total_data(net_theme_data['ETH']['DOWNLOADED']['TEXT'], downloaded_eth)
+        display_themed_line_graph(net_theme_data['ETH']['DOWNLOAD']['LINE_GRAPH'], cls.last_values_eth_download)
 
     @staticmethod
     def _show_themed_total_data(theme_data, amount):

res/themes/default.yaml

@@ -118,11 +118,15 @@ STATS:
         SHOW: False
       RADIAL:
         SHOW: False
+      LINE_GRAPH:
+        SHOW: False
     VIRTUAL:
       GRAPH:
         SHOW: False
       RADIAL:
         SHOW: False
+      LINE_GRAPH:
+        SHOW: False
       USED:
         SHOW: False
         SHOW_UNIT: False
@@ -142,6 +146,8 @@ STATS:
         SHOW: False
       RADIAL:
         SHOW: False
+      LINE_GRAPH:
+        SHOW: False
       TEXT:
         SHOW: False
         SHOW_UNIT: False
@@ -162,25 +168,33 @@ STATS:
       UPLOAD:
         TEXT:
           SHOW: False
+        LINE_GRAPH:
+          SHOW: False
       UPLOADED:
         TEXT:
           SHOW: False
       DOWNLOAD:
         TEXT:
           SHOW: False
+        LINE_GRAPH:
+          SHOW: False
       DOWNLOADED:
         TEXT:
           SHOW: False
     ETH:
       UPLOAD:
         TEXT:
           SHOW: False
+        LINE_GRAPH:
+          SHOW: False
       UPLOADED:
         TEXT:
           SHOW: False
       DOWNLOAD:
         TEXT:
           SHOW: False
+        LINE_GRAPH:
+          SHOW: False
       DOWNLOADED:
         TEXT:
           SHOW: False

res/themes/theme_example.yaml

@@ -653,6 +653,21 @@ STATS:
         FONT_COLOR: 200, 200, 200
         # BACKGROUND_COLOR: 0, 0, 0
         BACKGROUND_IMAGE: background.png
+      LINE_GRAPH:
+        SHOW: False
+        X: 300
+        Y: 220
+        WIDTH: 133
+        HEIGHT: 70
+        MIN_VALUE: 30
+        MAX_VALUE: 120
+        HISTORY_SIZE: 10
+        AUTOSCALE: True
+        LINE_COLOR: 61, 184, 225
+        AXIS: True
+        AXIS_COLOR: 255, 135, 0
+        # BACKGROUND_COLOR: 0, 0, 0
+        BACKGROUND_IMAGE: background.png
     VIRTUAL:
       GRAPH:
         SHOW: False
@@ -687,6 +702,21 @@ STATS:
         FONT_COLOR: 200, 200, 200
         # BACKGROUND_COLOR: 0, 0, 0
         BACKGROUND_IMAGE: background.png
+      LINE_GRAPH:
+        SHOW: False
+        X: 300
+        Y: 220
+        WIDTH: 133
+        HEIGHT: 70
+        MIN_VALUE: 30
+        MAX_VALUE: 120
+        HISTORY_SIZE: 10
+        AUTOSCALE: True
+        LINE_COLOR: 61, 184, 225
+        AXIS: True
+        AXIS_COLOR: 255, 135, 0
+        # BACKGROUND_COLOR: 0, 0, 0
+        BACKGROUND_IMAGE: background.png
       USED:
         SHOW: False
         SHOW_UNIT: True
@@ -763,6 +793,21 @@ STATS:
         FONT_COLOR: 200, 200, 200
         # BACKGROUND_COLOR: 0, 0, 0
         BACKGROUND_IMAGE: background.png
+      LINE_GRAPH:
+        SHOW: False
+        X: 300
+        Y: 220
+        WIDTH: 133
+        HEIGHT: 70
+        MIN_VALUE: 30
+        MAX_VALUE: 120
+        HISTORY_SIZE: 10
+        AUTOSCALE: True
+        LINE_COLOR: 61, 184, 225
+        AXIS: True
+        AXIS_COLOR: 255, 135, 0
+        # BACKGROUND_COLOR: 0, 0, 0
+        BACKGROUND_IMAGE: background.png
       TEXT:
         SHOW: False
         SHOW_UNIT: True
@@ -818,6 +863,21 @@ STATS:
           FONT_COLOR: 255, 255, 255
           # BACKGROUND_COLOR: 132, 154, 165
           BACKGROUND_IMAGE: background.png
+        LINE_GRAPH:
+          SHOW: False
+          X: 300
+          Y: 220
+          WIDTH: 133
+          HEIGHT: 70
+          MIN_VALUE: 30
+          MAX_VALUE: 120
+          HISTORY_SIZE: 10
+          AUTOSCALE: True
+          LINE_COLOR: 61, 184, 225
+          AXIS: True
+          AXIS_COLOR: 255, 135, 0
+          # BACKGROUND_COLOR: 0, 0, 0
+          BACKGROUND_IMAGE: background.png
       UPLOADED:
         TEXT:
           SHOW: FALSE
@@ -838,6 +898,21 @@ STATS:
           FONT_COLOR: 255, 255, 255
           # BACKGROUND_COLOR: 132, 154, 165
           BACKGROUND_IMAGE: background.png
+        LINE_GRAPH:
+          SHOW: False
+          X: 300
+          Y: 220
+          WIDTH: 133
+          HEIGHT: 70
+          MIN_VALUE: 30
+          MAX_VALUE: 120
+          HISTORY_SIZE: 10
+          AUTOSCALE: True
+          LINE_COLOR: 61, 184, 225
+          AXIS: True
+          AXIS_COLOR: 255, 135, 0
+          # BACKGROUND_COLOR: 0, 0, 0
+          BACKGROUND_IMAGE: background.png
       DOWNLOADED:
         TEXT:
           SHOW: FALSE
@@ -859,6 +934,21 @@ STATS:
           FONT_COLOR: 255, 255, 255
           # BACKGROUND_COLOR: 132, 154, 165
           BACKGROUND_IMAGE: background.png
+        LINE_GRAPH:
+          SHOW: False
+          X: 300
+          Y: 220
+          WIDTH: 133
+          HEIGHT: 70
+          MIN_VALUE: 30
+          MAX_VALUE: 120
+          HISTORY_SIZE: 10
+          AUTOSCALE: True
+          LINE_COLOR: 61, 184, 225
+          AXIS: True
+          AXIS_COLOR: 255, 135, 0
+          # BACKGROUND_COLOR: 0, 0, 0
+          BACKGROUND_IMAGE: background.png
       UPLOADED:
         TEXT:
           SHOW: FALSE
@@ -879,6 +969,21 @@ STATS:
           FONT_COLOR: 255, 255, 255
           # BACKGROUND_COLOR: 132, 154, 165
           BACKGROUND_IMAGE: background.png
+        LINE_GRAPH:
+          SHOW: False
+          X: 300
+          Y: 220
+          WIDTH: 133
+          HEIGHT: 70
+          MIN_VALUE: 30
+          MAX_VALUE: 120
+          HISTORY_SIZE: 10
+          AUTOSCALE: True
+          LINE_COLOR: 61, 184, 225
+          AXIS: True
+          AXIS_COLOR: 255, 135, 0
+          # BACKGROUND_COLOR: 0, 0, 0
+          BACKGROUND_IMAGE: background.png
       DOWNLOADED:
         TEXT:
           SHOW: FALSE

theme-editor.py

@@ -105,6 +105,7 @@ def refresh_theme():
     stats.CPU.frequency()
     stats.CPU.load()
     stats.CPU.temperature()
+    stats.CPU.fan_speed()
     stats.Gpu.stats()
     stats.Memory.stats()
     stats.Disk.stats()
@@ -197,9 +198,6 @@ def on_zone_click(event):
     # Apply system locale to this program
     locale.setlocale(locale.LC_ALL, '')
 
-    # Load theme file and generate first preview
-    refresh_theme()
-
     logger.debug("Starting Theme Editor...")
 
     # Get theme file to edit
@@ -217,6 +215,9 @@ def on_zone_click(event):
     else:  # linux variants
         subprocess.call(('xdg-open', "./" + theme_file))
 
+    # Load theme file and generate first preview
+    refresh_theme()
+
     # Create preview window
     logger.debug("Opening theme preview window with static data")
     viewer = tkinter.Tk()