Merge pull request #136 from amiltonjr/feature/add-cyberpunk-net-theme

Add Cyberpunk with network stats theme

Author: mathoudebine

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

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
+        theme: [ "3.5inchTheme2", "Cyberpunk", "Cyberpunk-net", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
                  "LandscapeMagicBlue", "BigClock" ]
 
     steps:

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

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
+        theme: [ "3.5inchTheme2", "Cyberpunk", "Cyberpunk-net", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
                  "LandscapeMagicBlue", "BigClock" ]
 
     steps:

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

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
+        theme: [ "3.5inchTheme2", "Cyberpunk", "Cyberpunk-net", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu",
                  "LandscapeMagicBlue", "BigClock" ]
 
     steps:

config.yaml

@@ -14,6 +14,7 @@ config:
   # - Landscape6Grid
   # - LandscapeMagicBlue
   # - Cyberpunk
+  # - Cyberpunk-net
   # - bash-dark-green
   # - bash-dark-green-gpu
   # - BigClock

library/stats.py

@@ -428,9 +428,10 @@ def stats():
         if THEME_DATA['STATS']['MEMORY']['VIRTUAL']['USED'].get("SHOW", False):
             virtual_used = sensors.Memory.virtual_used()
 
-            virtual_used_text = f"{int(virtual_used / 1000000):>5}"
+            virtual_used_text = f"{int(virtual_used / 1000000)}"
             if THEME_DATA['STATS']['MEMORY']['VIRTUAL']['USED'].get("SHOW_UNIT", True):
                 virtual_used_text += " M"
+            virtual_used_text = f"{virtual_used_text:<8}"
 
             display.lcd.DisplayText(
                 text=virtual_used_text,
@@ -575,7 +576,7 @@ def stats():
         upload_wlo, uploaded_wlo, download_wlo, downloaded_wlo = sensors.Net.stats(WLO_CARD, interval)
 
         if THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("SHOW", False):
-            upload_wlo_text = f"{bytes2human(upload_wlo)}/s"
+            upload_wlo_text = f"{bytes2human(upload_wlo, '%(value).1f %(symbol)s/s'):>10}"
             display.lcd.DisplayText(
                 text=f"{upload_wlo_text:>9}",
                 x=THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("X", 0),
@@ -611,7 +612,7 @@ def stats():
             )
 
         if THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("SHOW", False):
-            download_wlo_text = f"{bytes2human(download_wlo)}/s"
+            download_wlo_text = f"{bytes2human(download_wlo, '%(value).1f %(symbol)s/s'):>10}"
             display.lcd.DisplayText(
                 text=f"{download_wlo_text:>9}",
                 x=THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("X", 0),
@@ -649,7 +650,7 @@ def stats():
         upload_eth, uploaded_eth, download_eth, downloaded_eth = sensors.Net.stats(ETH_CARD, interval)
 
         if THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("SHOW", False):
-            upload_eth_text = f"{bytes2human(upload_eth)}/s"
+            upload_eth_text = f"{bytes2human(upload_eth, '%(value).1f %(symbol)s/s'):>10}"
             display.lcd.DisplayText(
                 text=f"{upload_eth_text:>9}",
                 x=THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("X", 0),
@@ -685,7 +686,7 @@ def stats():
             )
 
         if THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("SHOW", False):
-            download_eth_text = f"{bytes2human(download_eth)}/s"
+            download_eth_text = f"{bytes2human(download_eth, '%(value).1f %(symbol)s/s'):>10}"
             display.lcd.DisplayText(
                 text=f"{download_eth_text:>9}",
                 x=THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("X", 0),