works on linux!

Author: PouekDEV

.github/workflows/build.yml

@@ -1,5 +1,5 @@
 name: build
-on: [workflow_dispatch]
+on: [push, workflow_dispatch]
 
 jobs:
   build-for-linux:
@@ -28,9 +28,9 @@ jobs:
       - name: build
         shell: bash
         run: |
-          pyinstaller main.py --onefile --name=liquidWeb-cli -i "NONE"
-          pyinstaller framereceiver.py --onefile --name=frame-receiver -i "NONE"
-          pyinstaller hardwareserver.py --name=hardware-server -i "NONE"
+          pyinstaller main.py --onefile --name=liquidWeb-cli
+          pyinstaller framereceiver.py --onefile --name=frame-receiver
+          pyinstaller hardwareserver.py --onefile --name=hardware-server
           cd integration-runner
           npm run package
       - name: package

driver.py

@@ -34,20 +34,17 @@
 
 Resolution = namedtuple("Resolution", ["width", "height"])
 
-
 class RENDERING_MODE(str, Enum):
     RGBA = "RGBA"
     GIF = "GIF"
     FAST_GIF = "FAST_GIF"
     Q565 = "Q565"
 
-
 class DISPLAY_MODE(IntEnum):
     LIQUID = 2
     BUCKET = 4
     FAST_BUCKET = 5
 
-
 SUPPORTED_DEVICES = [
     {
         "pid": 0x3008,
@@ -90,7 +87,6 @@ class DISPLAY_MODE(IntEnum):
     }
 ]
 
-
 class KrakenLCD:
     pid: int
     serial: str
@@ -107,7 +103,6 @@ class KrakenLCD:
     buckets_to_use = 2
     black: Image.Image
     mask: Image.Image
-
     cache = None
 
     def __init__(self, brightness, orientation):
@@ -126,7 +121,7 @@ def __init__(self, brightness, orientation):
                     dev["maxBucketSize"],
                     (self.resolution.width * self.resolution.height * 4),
                 )
-                self.buckets_to_use = max(self.totalBuckets, 2)
+                self.buckets_to_use = max(self.total_buckets, 2)
                 self.brightness = brightness
                 self.orientation = orientation
                 self.speed_channels = dev["speedChannels"]
@@ -155,7 +150,8 @@ def __init__(self, brightness, orientation):
             if self.bulk_dev is None:
                 raise ValueError("Device not found or serial number mismatch.")
         except Exception:
-            raise Exception("Could not connect to kraken device. Is NZXT CAM closed ?")
+            # https://github.com/liquidctl/liquidctl/blob/main/extra/linux/71-liquidctl.rules
+            raise Exception("Could not connect to kraken device. Do you have the required permissions?")
 
         self.black = Image.new("RGBA", self.resolution, (0, 0, 0, 0))
         self.mask = Image.new("RGBA", self.resolution, (0, 0, 0, 0))
@@ -279,8 +275,7 @@ def delete_bucket(self, bucket: int, retries=1) -> bool:
     def delete_all_buckets(self):
         for bucket in range(self.total_buckets):
             for i in range(10):
-                status = self.deleteBucket(bucket, i)
-
+                status = self.delete_bucket(bucket, i)
                 if status:
                     break
                 time.sleep(0.1)
@@ -312,7 +307,7 @@ def create_bucket(
         status = self.read_until({b"\x33\x01": self.parse_standard_result})
         return status
 
-    def write_RGBA(self, RGBAData: bytes, bucket: int) -> bool:
+    def write_RGBA(self, RGBA_data: bytes, bucket: int) -> bool:
         self.write([0x36, 0x01, bucket])
         status = self.read_until({b"\x37\x01": self.parse_standard_result})
         if not status:
@@ -326,11 +321,11 @@ def write_RGBA(self, RGBAData: bytes, bucket: int) -> bool:
                 0x00,
                 0x00,
             ]
-            + list(len(RGBAData).to_bytes(4, "little"))
+            + list(len(RGBA_data).to_bytes(4, "little"))
         )
 
         self.bulk_write(bytes(header))
-        self.bulk_write(RGBAData)
+        self.bulk_write(RGBA_data)
 
         self.write([0x36, 0x02, bucket])
         status = self.read_until({b"\x37\x02": self.parse_standard_result})
@@ -402,7 +397,6 @@ def write_frame(self, frame: bytes):
                     self.next_frame_bucket * ((self.max_RGBA_bucket_size) / 1024 + 1)
                 ).to_bytes(2, "little")
             )
-
             result = (
                 (
                     self.delete_bucket(self.next_frame_bucket)

main.py

@@ -1,11 +1,4 @@
-# This file is mostly Windows slop but until my Linux switch it has to stay that way
-
-from PIL import Image
 import subprocess
-import threading
-import win32gui
-import win32con
-import pystray
 import signal
 import time
 import sys
@@ -17,56 +10,37 @@
 configuration = 0
 width = 0
 height = 0
-tray = 0
 PORT = 54217
 
-argumentsCount = len(sys.argv)
+arguments_count = len(sys.argv)
 minimum = False
-stopRequested = False
-hideOnce = False
-program = win32gui.GetForegroundWindow()
 
-def notEnoughArguments():
+def not_enough_arguments():
     print("[MAIN] Not enough arguments provided")
-    print("[MAIN] Usage: liquidWeb configuration (0-1) url fps (0-30) brightness (0-100%) orientation (0-360°) system-tray (0-1) port (Optional. Will use the selected one plus two next ones. Default 54217,54218,54219)")
+    print("[MAIN] Usage: liquidWeb configuration (0-1) url fps (0-30) brightness (0-100%) orientation (0-360°) port (Optional. Will use the selected one plus two next ones. Default 54217, 54218, 54219)")
     sys.exit()
 
-def trayQuit(icon, item):
-    global stopRequested
-    stopRequested = True
-    icon.stop()
-
-def show(icon, item):
-    win32gui.ShowWindow(program, win32con.SW_RESTORE)
-
-def trayThread():
-    img = Image.new("RGB", (16, 16), (80, 0, 121))
-    icon = pystray.Icon(name="liquidWeb-cli", title="liquidWeb", icon=img, menu=pystray.Menu(
-        pystray.MenuItem("Show", show),
-        pystray.MenuItem("Quit", trayQuit)
-    ))
-    icon.run()
-
-if argumentsCount >= 3:
+if arguments_count >= 3:
     configuration = sys.argv[1]
     url = sys.argv[2]
-    if argumentsCount == 3:
+    if arguments_count == 3:
         minimum = True
 else:
-    notEnoughArguments()
-if argumentsCount >= 6:
+    not_enough_arguments()
+if arguments_count >= 6:
     fps = sys.argv[3]
+    if fps > 30:
+        print("[MAIN] Can't set more than 30 fps")
+        fps = 30
     brightness = sys.argv[4]
     orientation = sys.argv[5]
 else:
     if not minimum:
-        notEnoughArguments()
-if argumentsCount >= 7:
-    tray = sys.argv[6]
-if argumentsCount >= 8:
-    PORT = sys.argv[7]
+        not_enough_arguments()
+if arguments_count >= 7:
+    PORT = sys.argv[6]
 
-if argumentsCount == 3:
+if arguments_count == 3:
     width = 1280
     height = 720
     fps = 60
@@ -75,41 +49,19 @@ def trayThread():
     height = 640
     configuration = 0
 
-subprocess.call("net stop hns")
-subprocess.call("net start hns")
+#subprocess.call("taskkill /im integration-runner.exe /f /t")
+#subprocess.call("taskkill /im frame-receiver.exe /f /t")
+#subprocess.call("taskkill /im hardware-server.exe /f /t")
 
-subprocess.call("taskkill /im integration-runner.exe /f /t")
-subprocess.call("taskkill /im frame-receiver.exe /f /t")
-subprocess.call("taskkill /im hardware-server.exe /f /t")
-
-time.sleep(5)
-
-p1 = subprocess.Popen(["./modules/integration-runner-win32-x64/integration-runner.exe", f"--width={width}", f"--height={height}", f"--fps={fps}", f"--configuration={configuration}", f"--url={url}", f"--port={PORT}"])
-if argumentsCount >= 5:
+p1 = subprocess.Popen(["./modules/integration-runner-linux-x64/integration-runner", f"--width={width}", f"--height={height}", f"--fps={fps}", f"--configuration={configuration}", f"--url={url}", f"--port={PORT}"])
+if arguments_count >= 5:
     p2 = subprocess.Popen(["./modules/frame-receiver", f"{brightness}", f"{orientation}", f"{PORT}"])
     p3 = subprocess.Popen(["./modules/hardware-server/hardware-server", f"{int(PORT) + 1}"])
 
-if tray == "1":
-    threading.Thread(target=trayThread, daemon=True).start()
-
 try:
     while True:
         time.sleep(1)
-        if tray == "1" and not hideOnce:
-            win32gui.ShowWindow(program , win32con.SW_HIDE)
-            hideOnce = True
-        if tray == "1" and hideOnce:
-            placement = win32gui.GetWindowPlacement(program)
-            if placement[1] == win32con.SW_SHOWMINIMIZED:
-                win32gui.ShowWindow(program , win32con.SW_HIDE)
-        if stopRequested:
-            win32gui.ShowWindow(program, win32con.SW_RESTORE)
-            p1.terminate()
-            p2.send_signal(signal.CTRL_BREAK_EVENT)
-            p3.terminate()
-            print("[MAIN] Requested quit from tray icon")
-            break
-        if argumentsCount >= 6:
+        if arguments_count >= 6:
             if p1.poll() is not None or p2.poll() is not None or p3.poll() is not None:
                 print("[MAIN] One process exited, shutting down the other")
                 break
@@ -121,6 +73,6 @@ def trayThread():
     print(f"[MAIN] {e}")
     print("[MAIN] Stopping")
     p1.terminate()
-    if argumentsCount >= 6:
+    if arguments_count >= 6:
         p2.send_signal(signal.CTRL_BREAK_EVENT)
         p3.terminate()