trcc-linux 2.0.1__tar.gz → 3.0.5__tar.gz

{trcc_linux-2.0.1 → trcc_linux-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 2.0.1
+Version: 3.0.5
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme
@@ -26,20 +26,29 @@ Requires-Python: >=3.9
 Requires-Dist: numpy>=1.24.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: psutil>=5.9.0
-Requires-Dist: py7zr>=0.20.0
-Requires-Dist: pyqt6>=6.5.0
+Requires-Dist: pyside6>=6.5.0
 Requires-Dist: pyusb>=1.2.0
+Requires-Dist: typer>=0.9.0
 Provides-Extra: all
 Requires-Dist: dbus-python>=1.3.0; extra == 'all'
+Requires-Dist: fastapi>=0.100; extra == 'all'
 Requires-Dist: hidapi>=0.14.0; extra == 'all'
+Requires-Dist: httpx>=0.24.0; extra == 'all'
 Requires-Dist: nvidia-ml-py>=11.0.0; extra == 'all'
 Requires-Dist: pygobject>=3.42.0; extra == 'all'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'all'
 Requires-Dist: pytest>=7.0.0; extra == 'all'
+Requires-Dist: python-multipart>=0.0.6; extra == 'all'
 Requires-Dist: ruff>=0.4.0; extra == 'all'
+Requires-Dist: uvicorn[standard]>=0.20; extra == 'all'
+Provides-Extra: api
+Requires-Dist: fastapi>=0.100; extra == 'api'
+Requires-Dist: uvicorn[standard]>=0.20; extra == 'api'
 Provides-Extra: dev
+Requires-Dist: httpx>=0.24.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest>=7.0.0; extra == 'dev'
+Requires-Dist: python-multipart>=0.0.6; extra == 'dev'
 Requires-Dist: ruff>=0.4.0; extra == 'dev'
 Provides-Extra: hid
 Requires-Dist: hidapi>=0.14.0; extra == 'hid'
@@ -87,9 +96,13 @@ Run `lsusb` to find your USB ID (`xxxx:xxxx` after `ID`), then match it below.
 | USB ID | Devices |
 |--------|---------|
 | `87CD:70DB` | FROZEN HORIZON PRO, FROZEN MAGIC PRO, FROZEN VISION V2, CORE VISION, ELITE VISION, AK120, AX120, PA120 DIGITAL, Wonder Vision |
-| `87AD:70DB` | GrandVision 360 AIO |
 | `0416:5406` | LC1, LC2, LC3, LC5 (AIO pump heads) |
-| `0402:3922` | FROZEN WARFRAME, FROZEN WARFRAME SE |
+| `0402:3922` | FROZEN WARFRAME, FROZEN WARFRAME 360, FROZEN WARFRAME SE |
+
+**Bulk USB devices** — raw USB protocol:
+| USB ID | Devices |
+|--------|---------|
+| `87AD:70DB` | GrandVision 360 AIO, Mjolnir Vision 360 |
 
 **HID LCD devices** — auto-detected, needs hardware testers:
 | USB ID | Devices |
@@ -209,9 +222,10 @@ environment.systemPackages = with pkgs; [
 services.udev.extraRules = ''
   # SCSI LCD devices
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="87cd", ATTRS{idProduct}=="70db", MODE="0666"
-  SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="87ad", ATTRS{idProduct}=="70db", MODE="0666"
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="0416", ATTRS{idProduct}=="5406", MODE="0666"
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="0402", ATTRS{idProduct}=="3922", MODE="0666"
+  # Bulk USB devices
+  SUBSYSTEM=="usb", ATTR{idVendor}=="87ad", ATTR{idProduct}=="70db", MODE="0666"
   # HID LCD/LED devices
   SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0416", ATTRS{idProduct}=="5302", MODE="0666"
   SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0418", ATTRS{idProduct}=="5303", MODE="0666"
@@ -230,12 +244,24 @@ pip install --break-system-packages trcc-linux && trcc install-desktop
 trcc gui                  # Launch GUI
 trcc detect               # Show connected devices
 trcc send image.png       # Send image to LCD
-trcc report               # Generate diagnostic report for bug reports
+trcc color "#ff0000"      # Fill LCD with solid color
+trcc brightness 2         # Set brightness (1=25%, 2=50%, 3=100%)
+trcc rotation 90          # Rotate display (0/90/180/270)
+trcc theme-list           # List available themes
+trcc theme-load NAME      # Load a theme by name
+trcc overlay              # Render and send overlay
+trcc screencast           # Live screen capture to LCD
+trcc video clip.mp4       # Play video on LCD
+trcc led-color "#00ff00"  # Set LED color
+trcc led-mode breathing   # Set LED effect mode
+trcc serve                # Start REST API server
+trcc doctor               # Check system dependencies
+trcc report               # Generate diagnostic report
 trcc setup-udev           # Install udev rules
 trcc install-desktop      # Install app menu entry and icon
 ```
 
-See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 17 commands, options, and troubleshooting.
+See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 36 commands, options, and troubleshooting.
 
 ## Documentation
 
@@ -262,6 +288,16 @@ A big thanks to everyone who has contributed to this project:
 - **[PantherX12max](https://github.com/PantherX12max)** — Trofeo Vision LCD hardware testing
 - **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** — AX120 Digital hardware testing & USB descriptor dumps
 - **[Xentrino](https://github.com/Xentrino)** — Peerless Assassin 120 Digital ARGB White hardware testing
+- **[Pikarz](https://github.com/Pikarz)** — Mjolnir Vision 360 bulk protocol testing
+- **[bipobuilt](https://github.com/bipobuilt)** — GrandVision 360 AIO bulk protocol testing
+- **[cadeon](https://github.com/cadeon)** — GrandVision 360 AIO bulk protocol testing
+- **[michael-spinelli](https://github.com/michael-spinelli)** — Assassin Spirit 120 Vision ARGB HID testing
+- **[gizbo](https://github.com/gizbo)** — FROZEN WARFRAME SCSI color bug report
+- **[hexskrew](https://github.com/hexskrew)** — Assassin X 120R Digital ARGB HID testing
+- **[Rizzzolo](https://github.com/Rizzzolo)** — Phantom Spirit 120 Digital EVO hardware testing
+- **[apj202-ops](https://github.com/apj202-ops)** — Frozen Warframe SE HID testing
+- **[Edoardo-Rossi-EOS](https://github.com/Edoardo-Rossi-EOS)** — Frozen Warframe 360 HID testing
+- **[edoargo1996](https://github.com/edoargo1996)** — Frozen Warframe 360 HID testing
 
 ## License
 

{trcc_linux-2.0.1 → trcc_linux-3.0.5}/README.md

@@ -35,9 +35,13 @@ Run `lsusb` to find your USB ID (`xxxx:xxxx` after `ID`), then match it below.
 | USB ID | Devices |
 |--------|---------|
 | `87CD:70DB` | FROZEN HORIZON PRO, FROZEN MAGIC PRO, FROZEN VISION V2, CORE VISION, ELITE VISION, AK120, AX120, PA120 DIGITAL, Wonder Vision |
-| `87AD:70DB` | GrandVision 360 AIO |
 | `0416:5406` | LC1, LC2, LC3, LC5 (AIO pump heads) |
-| `0402:3922` | FROZEN WARFRAME, FROZEN WARFRAME SE |
+| `0402:3922` | FROZEN WARFRAME, FROZEN WARFRAME 360, FROZEN WARFRAME SE |
+
+**Bulk USB devices** — raw USB protocol:
+| USB ID | Devices |
+|--------|---------|
+| `87AD:70DB` | GrandVision 360 AIO, Mjolnir Vision 360 |
 
 **HID LCD devices** — auto-detected, needs hardware testers:
 | USB ID | Devices |
@@ -157,9 +161,10 @@ environment.systemPackages = with pkgs; [
 services.udev.extraRules = ''
   # SCSI LCD devices
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="87cd", ATTRS{idProduct}=="70db", MODE="0666"
-  SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="87ad", ATTRS{idProduct}=="70db", MODE="0666"
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="0416", ATTRS{idProduct}=="5406", MODE="0666"
   SUBSYSTEM=="scsi_generic", ATTRS{idVendor}=="0402", ATTRS{idProduct}=="3922", MODE="0666"
+  # Bulk USB devices
+  SUBSYSTEM=="usb", ATTR{idVendor}=="87ad", ATTR{idProduct}=="70db", MODE="0666"
   # HID LCD/LED devices
   SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0416", ATTRS{idProduct}=="5302", MODE="0666"
   SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0418", ATTRS{idProduct}=="5303", MODE="0666"
@@ -178,12 +183,24 @@ pip install --break-system-packages trcc-linux && trcc install-desktop
 trcc gui                  # Launch GUI
 trcc detect               # Show connected devices
 trcc send image.png       # Send image to LCD
-trcc report               # Generate diagnostic report for bug reports
+trcc color "#ff0000"      # Fill LCD with solid color
+trcc brightness 2         # Set brightness (1=25%, 2=50%, 3=100%)
+trcc rotation 90          # Rotate display (0/90/180/270)
+trcc theme-list           # List available themes
+trcc theme-load NAME      # Load a theme by name
+trcc overlay              # Render and send overlay
+trcc screencast           # Live screen capture to LCD
+trcc video clip.mp4       # Play video on LCD
+trcc led-color "#00ff00"  # Set LED color
+trcc led-mode breathing   # Set LED effect mode
+trcc serve                # Start REST API server
+trcc doctor               # Check system dependencies
+trcc report               # Generate diagnostic report
 trcc setup-udev           # Install udev rules
 trcc install-desktop      # Install app menu entry and icon
 ```
 
-See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 17 commands, options, and troubleshooting.
+See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 36 commands, options, and troubleshooting.
 
 ## Documentation
 
@@ -210,6 +227,16 @@ A big thanks to everyone who has contributed to this project:
 - **[PantherX12max](https://github.com/PantherX12max)** — Trofeo Vision LCD hardware testing
 - **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** — AX120 Digital hardware testing & USB descriptor dumps
 - **[Xentrino](https://github.com/Xentrino)** — Peerless Assassin 120 Digital ARGB White hardware testing
+- **[Pikarz](https://github.com/Pikarz)** — Mjolnir Vision 360 bulk protocol testing
+- **[bipobuilt](https://github.com/bipobuilt)** — GrandVision 360 AIO bulk protocol testing
+- **[cadeon](https://github.com/cadeon)** — GrandVision 360 AIO bulk protocol testing
+- **[michael-spinelli](https://github.com/michael-spinelli)** — Assassin Spirit 120 Vision ARGB HID testing
+- **[gizbo](https://github.com/gizbo)** — FROZEN WARFRAME SCSI color bug report
+- **[hexskrew](https://github.com/hexskrew)** — Assassin X 120R Digital ARGB HID testing
+- **[Rizzzolo](https://github.com/Rizzzolo)** — Phantom Spirit 120 Digital EVO hardware testing
+- **[apj202-ops](https://github.com/apj202-ops)** — Frozen Warframe SE HID testing
+- **[Edoardo-Rossi-EOS](https://github.com/Edoardo-Rossi-EOS)** — Frozen Warframe 360 HID testing
+- **[edoargo1996](https://github.com/edoargo1996)** — Frozen Warframe 360 HID testing
 
 ## License
 

{trcc_linux-2.0.1 → trcc_linux-3.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "2.0.1"
+version = "3.0.5"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -29,12 +29,12 @@ classifiers = [
 ]
 
 dependencies = [
-    "PyQt6>=6.5.0",
+    "PySide6>=6.5.0",
     "Pillow>=10.0.0",
     "numpy>=1.24.0",
     "psutil>=5.9.0",
-    "py7zr>=0.20.0",
     "pyusb>=1.2.0",
+    "typer>=0.9.0",
 ]
 
 [project.optional-dependencies]
@@ -48,13 +48,19 @@ wayland = [
 hid = [
     "hidapi>=0.14.0",
 ]
+api = [
+    "fastapi>=0.100",
+    "uvicorn[standard]>=0.20",
+]
 dev = [
     "pytest>=7.0.0",
     "pytest-cov>=4.0.0",
     "ruff>=0.4.0",
+    "httpx>=0.24.0",
+    "python-multipart>=0.0.6",
 ]
 all = [
-    "trcc-linux[nvidia,wayland,hid,dev]",
+    "trcc-linux[nvidia,wayland,hid,api,dev]",
 ]
 
 [project.urls]

{trcc_linux-2.0.1 → trcc_linux-3.0.5}/src/trcc/__init__.py

@@ -30,10 +30,10 @@ __author__ = "TRCC Linux Contributors"
 from trcc.dc_config import DcConfig
 from trcc.dc_parser import dc_to_overlay_config, parse_dc_file
 from trcc.device_detector import detect_devices, get_device_path
-from trcc.driver_lcd import LCDDriver
+from trcc.device_lcd import LCDDriver
 
 # Animation
-from trcc.media_player import GIFAnimator, GIFThemeLoader, VideoPlayer
+from trcc.media_player import VideoDecoder
 from trcc.system_info import format_metric, get_all_metrics
 
 __all__ = [
@@ -51,7 +51,5 @@ __all__ = [
     "parse_dc_file",
     "dc_to_overlay_config",
     # Animation
-    "GIFAnimator",
-    "GIFThemeLoader",
-    "VideoPlayer",
+    "VideoDecoder",
 ]

{trcc_linux-2.0.1 → trcc_linux-3.0.5}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "2.0.1"
+__version__ = "3.0.5"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -66,3 +66,28 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          constants.py (single source of truth), PM=FBL default instead of
 #          hardcoded 320x320. Fix PyQt6 version in trcc report. CI: add ffmpeg,
 #          auto-publish to PyPI on tag push. Delete dead shim files.
+# 3.0.0  - Hexagonal architecture: services layer (7 services), CLI Typer,
+#          REST API adapter, FontResolver extraction, pure media decoders,
+#          overlay_renderer merged into services/overlay, dead code removed
+#          (theme_io, constants, device_base). Module renames: paths→data_repository,
+#          sensor_enumerator→system_sensors, sysinfo_config→system_config,
+#          cloud_downloader→theme_cloud, driver_lcd→device_lcd. 2081 tests.
+# 3.0.1  - Full CLI parity: 36 Typer commands expose all service methods.
+#          New: theme-save, theme-export, theme-import, led-sensor, mask --clear,
+#          brightness, rotation, screencast, overlay, theme-list, theme-load,
+#          led-color, led-mode, led-brightness, led-off, video. 2148 tests.
+# 3.0.2  - Fix bulk protocol (87AD:70DB GrandVision): correct frame header
+#          format (magic, cmd, dimensions, mode), robust kernel driver detach
+#          before set_configuration(), chunked 16 KiB writes, interface claim.
+#          Fix legacy autostart cleanup (glob desktop files). 2156 tests.
+# 3.0.3  - Fix background display mode: continuous LCD sending via metrics
+#          timer (C# myBjxs/isToTimer parity), toggle OFF renders black+overlays,
+#          theme click resets all mode toggles. Security hardening (timing-safe
+#          auth, PIL bomb cap, zip-slip, TOCTOU). Tooltips on all user-facing
+#          buttons. Distro name in debug report. Help→troubleshooting guide.
+# 3.0.4  - Fix bulk frame encoding: JPEG (cmd=2) instead of raw RGB565 for
+#          all USBLCDNew devices (87AD:70DB), matching C# ImageToJpg protocol.
+#          PM=32 remains RGB565 (cmd=3). Add PM=5 to bulk resolution table
+#          (Mjolnir Vision → 240×320). 2166 tests.
+# 3.0.5  - Fix LED mode button images: asset filename typo caused buttons
+#          to show plain text instead of icons. 2167 tests.

trcc_linux-3.0.5/src/trcc/api.py

@@ -0,0 +1,207 @@
+"""FastAPI REST API — Driving adapter for headless/remote control.
+
+Endpoints:
+    GET  /health              — Server status
+    GET  /devices             — List detected devices
+    POST /devices/detect      — Rescan for devices
+    POST /devices/{id}/select — Select a device
+    POST /devices/{id}/send   — Send image to device LCD
+    GET  /devices/{id}        — Get device details
+    GET  /themes              — List available themes
+
+Security:
+    - Localhost-only by default (bind 127.0.0.1)
+    - Optional token auth via --token flag (X-API-Token header)
+    - 10 MB upload limit with PIL format validation
+"""
+from __future__ import annotations
+
+import hmac
+import io
+import logging
+
+from fastapi import FastAPI, HTTPException, Request, UploadFile
+from fastapi.responses import JSONResponse
+from PIL import Image
+from pydantic import BaseModel
+
+from trcc.__version__ import __version__
+from trcc.services import DeviceService, ImageService, ThemeService
+
+log = logging.getLogger(__name__)
+
+MAX_UPLOAD_BYTES = 10 * 1024 * 1024  # 10 MB
+
+app = FastAPI(title="TRCC Linux", version=__version__)
+
+# ── Shared service instances ──────────────────────────────────────────
+
+_device_svc = DeviceService()
+
+# ── Token auth middleware (optional, enabled via --token) ─────────────
+
+_api_token: str | None = None
+
+
+def configure_auth(token: str | None) -> None:
+    """Set the API token. Called by CLI serve command."""
+    global _api_token  # noqa: PLW0603
+    _api_token = token
+
+
+@app.middleware("http")
+async def check_token(request: Request, call_next):
+    """Reject requests without valid token (if token is configured)."""
+    if _api_token and request.url.path != "/health":
+        header_token = request.headers.get("X-API-Token", "")
+        if not hmac.compare_digest(header_token, _api_token):
+            return JSONResponse(status_code=401, content={"detail": "Invalid token"})
+    return await call_next(request)
+
+
+# ── Pydantic models ──────────────────────────────────────────────────
+
+class DeviceResponse(BaseModel):
+    id: int
+    name: str
+    vid: int
+    pid: int
+    protocol: str
+    resolution: tuple[int, int]
+    path: str
+
+
+class ThemeResponse(BaseModel):
+    name: str
+    category: str
+    is_animated: bool
+    has_config: bool
+
+
+# ── Helpers ───────────────────────────────────────────────────────────
+
+def _device_to_response(idx: int, dev) -> DeviceResponse:
+    return DeviceResponse(
+        id=idx,
+        name=dev.name,
+        vid=dev.vid,
+        pid=dev.pid,
+        protocol=dev.protocol or "scsi",
+        resolution=dev.resolution or (0, 0),
+        path=dev.path or "",
+    )
+
+
+def _get_device_by_id(device_id: int):
+    """Look up device by index, raise 404 if not found."""
+    devices = _device_svc.devices
+    if device_id < 0 or device_id >= len(devices):
+        raise HTTPException(status_code=404, detail=f"Device {device_id} not found")
+    return devices[device_id]
+
+
+# ── Endpoints ────────────────────────────────────────────────────────
+
+@app.get("/health")
+def health() -> dict:
+    """Health check (always accessible, no auth required)."""
+    return {"status": "ok", "version": __version__}
+
+
+@app.get("/devices")
+def list_devices() -> list[DeviceResponse]:
+    """List currently known devices."""
+    return [_device_to_response(i, d) for i, d in enumerate(_device_svc.devices)]
+
+
+@app.post("/devices/detect")
+def detect_devices() -> list[DeviceResponse]:
+    """Rescan USB for LCD devices."""
+    _device_svc.detect()
+    return [_device_to_response(i, d) for i, d in enumerate(_device_svc.devices)]
+
+
+@app.post("/devices/{device_id}/select")
+def select_device(device_id: int) -> dict:
+    """Select a device by index."""
+    dev = _get_device_by_id(device_id)
+    _device_svc.select(dev)
+    return {"selected": dev.name, "resolution": dev.resolution}
+
+
+@app.get("/devices/{device_id}")
+def get_device(device_id: int) -> DeviceResponse:
+    """Get details for a specific device."""
+    dev = _get_device_by_id(device_id)
+    return _device_to_response(device_id, dev)
+
+
+@app.post("/devices/{device_id}/send")
+async def send_image(device_id: int, image: UploadFile, rotation: int = 0,
+                     brightness: int = 100) -> dict:
+    """Send an image to the device LCD.
+
+    Accepts image file upload. Validates size and format before processing.
+    """
+    dev = _get_device_by_id(device_id)
+    _device_svc.select(dev)
+
+    # Read and validate upload
+    data = await image.read()
+    if len(data) > MAX_UPLOAD_BYTES:
+        raise HTTPException(status_code=413, detail="Image exceeds 10 MB limit")
+
+    try:
+        img = Image.open(io.BytesIO(data))
+        img.load()  # Force decode to catch corrupt files
+    except Exception:
+        raise HTTPException(status_code=400, detail="Invalid image format")
+
+    # Apply rotation and brightness
+    if rotation:
+        img = ImageService.apply_rotation(img, rotation)
+    if brightness != 100:
+        img = ImageService.apply_brightness(img, brightness)
+
+    # Resize to device resolution
+    w, h = dev.resolution or (320, 320)
+    img = ImageService.resize(img, w, h)
+
+    # Convert and send
+    byte_order = ImageService.byte_order_for(
+        dev.protocol or "scsi", (w, h)
+    )
+    rgb565 = ImageService.to_rgb565(img, byte_order)
+    ok = _device_svc.send_rgb565(rgb565, w, h)
+
+    if not ok:
+        raise HTTPException(status_code=500, detail="Send failed (device busy or error)")
+
+    return {"sent": True, "resolution": (w, h)}
+
+
+@app.get("/themes")
+def list_themes(resolution: str = "320x320") -> list[ThemeResponse]:
+    """List available local themes for a given resolution."""
+    try:
+        parts = resolution.split("x")
+        w, h = int(parts[0]), int(parts[1])
+    except (ValueError, IndexError):
+        raise HTTPException(status_code=400, detail="Invalid resolution format (use WxH)")
+    if not (100 <= w <= 4096 and 100 <= h <= 4096):
+        raise HTTPException(status_code=400, detail="Resolution out of range (100-4096)")
+
+    from pathlib import Path
+
+    from trcc.data_repository import ThemeDir
+    theme_dir = Path(str(ThemeDir.for_resolution(w, h)))
+    themes = ThemeService.discover_local(theme_dir, (w, h))
+    return [
+        ThemeResponse(
+            name=t.name,
+            category=t.category or "",
+            is_animated=t.is_animated,
+            has_config=t.config_path is not None,
+        )
+        for t in themes
+    ]