trcc-linux 9.4.0__tar.gz → 9.4.2__tar.gz

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 9.4.0
+Version: 9.4.2
 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
@@ -68,6 +68,8 @@ Description-Content-Type: text/markdown
 
 # Intro
 > "I’ll do it while you talk" - Józef Piłsudski, was the founding father of modern Poland
+
+> "Free software is a matter of liberty, not price. To understand the concept, you should think of free as in free speech, not as in free beer." - [Richard Stallman](https://stallman.org/), founder of the [Free Software Foundation](https://www.fsf.org/)
 # TRCC Linux
 > **Looking for testers!** We need **Linux**, **Windows**, **macOS**, and **BSD** testers. If you have a Thermalright LCD or LED device on any platform, grab the latest [release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and [let us know how it goes](https://github.com/Lexonight1/thermalright-trcc-linux/issues) — run `trcc report` and paste the output in an issue. Every test report helps, even if nothing works yet!
 
@@ -83,7 +85,7 @@ Description-Content-Type: text/markdown
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5799_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-6096_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-72%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -386,7 +388,9 @@ src/trcc/
 
 ## Contributors
 
-A big thanks to everyone who has contributed invaluable reports to this project:
+A huge thank you to every single person who filed an issue, pasted a `trcc report`, or just said "it doesn't work." You are the reason this project supports 6 USB protocols, 16 resolutions, and 12 LED styles from a single developer with one device. Every bug report, every test on hardware I don't own, every "hey this is broken" — that's open source at its best. You're not wasting your time. You're building something together.
+
+Special thanks to everyone who has contributed invaluable reports to this project:
 
 **Frozen Warframe** — **[gizbo](https://github.com/gizbo)** · **[knappstar](https://github.com/knappstar)** · **[Scifiguygaming](https://github.com/Scifiguygaming)** · **[apj202-ops](https://github.com/apj202-ops)** · **[loosethoughts19-hash](https://github.com/loosethoughts19-hash)** · **[Edoardo-Rossi-EOS](https://github.com/Edoardo-Rossi-EOS)** · **[edoargo1996](https://github.com/edoargo1996)** · **[stephendesmond1-cmd](https://github.com/stephendesmond1-cmd)** · **[riodevelop](https://github.com/riodevelop)** · **[wobbegongus](https://github.com/wobbegongus)** · **[Pallemz](https://github.com/Pallemz)** · **[pawbtism](https://github.com/pawbtism)**
 
@@ -438,4 +442,6 @@ If this project saved you from keeping a Windows partition around, consider **[b
 
 ## License
 
-GPL-3.0
+[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) — free as in freedom. This project is and always will be free software. You can use it, study it, modify it, and share it. That's the deal.
+
+Built on the shoulders of [Richard Stallman](https://stallman.org/), the [GNU Project](https://www.gnu.org/gnu/thegnuproject.en.html), and the [Free Software Foundation](https://www.fsf.org/). If you care about software freedom, [read why it matters](https://www.gnu.org/philosophy/free-sw.en.html).

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/README.md

@@ -1,5 +1,7 @@
 # Intro
 > "I’ll do it while you talk" - Józef Piłsudski, was the founding father of modern Poland
+
+> "Free software is a matter of liberty, not price. To understand the concept, you should think of free as in free speech, not as in free beer." - [Richard Stallman](https://stallman.org/), founder of the [Free Software Foundation](https://www.fsf.org/)
 # TRCC Linux
 > **Looking for testers!** We need **Linux**, **Windows**, **macOS**, and **BSD** testers. If you have a Thermalright LCD or LED device on any platform, grab the latest [release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and [let us know how it goes](https://github.com/Lexonight1/thermalright-trcc-linux/issues) — run `trcc report` and paste the output in an issue. Every test report helps, even if nothing works yet!
 
@@ -15,7 +17,7 @@
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5799_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-6096_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-72%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -318,7 +320,9 @@ src/trcc/
 
 ## Contributors
 
-A big thanks to everyone who has contributed invaluable reports to this project:
+A huge thank you to every single person who filed an issue, pasted a `trcc report`, or just said "it doesn't work." You are the reason this project supports 6 USB protocols, 16 resolutions, and 12 LED styles from a single developer with one device. Every bug report, every test on hardware I don't own, every "hey this is broken" — that's open source at its best. You're not wasting your time. You're building something together.
+
+Special thanks to everyone who has contributed invaluable reports to this project:
 
 **Frozen Warframe** — **[gizbo](https://github.com/gizbo)** · **[knappstar](https://github.com/knappstar)** · **[Scifiguygaming](https://github.com/Scifiguygaming)** · **[apj202-ops](https://github.com/apj202-ops)** · **[loosethoughts19-hash](https://github.com/loosethoughts19-hash)** · **[Edoardo-Rossi-EOS](https://github.com/Edoardo-Rossi-EOS)** · **[edoargo1996](https://github.com/edoargo1996)** · **[stephendesmond1-cmd](https://github.com/stephendesmond1-cmd)** · **[riodevelop](https://github.com/riodevelop)** · **[wobbegongus](https://github.com/wobbegongus)** · **[Pallemz](https://github.com/Pallemz)** · **[pawbtism](https://github.com/pawbtism)**
 
@@ -370,4 +374,6 @@ If this project saved you from keeping a Windows partition around, consider **[b
 
 ## License
 
-GPL-3.0
+[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) — free as in freedom. This project is and always will be free software. You can use it, study it, modify it, and share it. That's the deal.
+
+Built on the shoulders of [Richard Stallman](https://stallman.org/), the [GNU Project](https://www.gnu.org/gnu/thegnuproject.en.html), and the [Free Software Foundation](https://www.fsf.org/). If you care about software freedom, [read why it matters](https://www.gnu.org/philosophy/free-sw.en.html).

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "9.4.0"
+version = "9.4.2"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/__version__.py

@@ -1,4 +1,4 @@
 """TRCC Linux version information. History in doc/CHANGELOG.md."""
 
-__version__ = "9.4.0"
+__version__ = "9.4.2"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/adapters/device/_usb_helpers.py

@@ -22,6 +22,24 @@ log = logging.getLogger(__name__)
 _ERR_NOT_FOUND = "USB device {vid:04x}:{pid:04x} not found"
 
 
+def close_usb_device(dev: Any, interface: int = 0) -> None:
+    """Release interface and dispose USB device resources.
+
+    Safe to call on None or already-closed devices.
+    """
+    if dev is None:
+        return
+    import usb.util
+    try:
+        usb.util.release_interface(dev, interface)
+    except Exception:
+        pass
+    try:
+        usb.util.dispose_resources(dev)
+    except Exception:
+        pass
+
+
 def _err_interface_busy() -> str:
     """Platform-aware error for USB interface claim failure after driver detach."""
     from trcc.core.platform import LINUX
@@ -250,12 +268,7 @@ class BulkFrameDevice:
     def close(self) -> None:
         """Release USB device."""
         if self._dev is not None:
-            import usb.util
-            try:
-                usb.util.release_interface(self._dev, self._intf)
-            except Exception:
-                pass
-            usb.util.dispose_resources(self._dev)
+            close_usb_device(self._dev, self._intf)
             self._dev = None
             self._ep_out = None
             self._ep_in = None

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/adapters/device/hid.py

@@ -28,7 +28,6 @@ import usb.core
 import usb.util
 
 from trcc.core.models import (
-    DEVICE_BUTTON_IMAGE,  # noqa: F401 — re-export
     HandshakeResult,  # noqa: F401 — re-export
     HidHandshakeInfo,
     fbl_to_resolution,
@@ -122,7 +121,7 @@ USB_INTERFACE = 0
 
 
 # Domain data re-exported from core.models (canonical location):
-# DEVICE_BUTTON_IMAGE, PM_TO_BUTTON_IMAGE, get_button_image, HidHandshakeInfo
+# get_button_image, HidHandshakeInfo
 
 # =========================================================================
 # Abstract USB transport
@@ -722,14 +721,8 @@ class PyUsbTransport(UsbTransport):
             UsbDevice.Exit();
         """
         if self._device is not None:
-            try:
-                usb.util.release_interface(self._device, USB_INTERFACE)  # type: ignore[union-attr]
-            except Exception:
-                pass
-            try:
-                usb.util.dispose_resources(self._device)  # type: ignore[union-attr]
-            except Exception:
-                pass
+            from ._usb_helpers import close_usb_device
+            close_usb_device(self._device, USB_INTERFACE)
             self._device = None
         self._is_open = False
 

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/adapters/device/linux/detector.py

@@ -122,12 +122,13 @@ def find_lcd_devices(detect_fn=None) -> List[Dict]:
 
             if dev.implementation == 'hid_led':
                 try:
-                    from trcc.adapters.device.led import PmRegistry, probe_led_model
+                    from trcc.adapters.device.led import probe_led_model
+                    from trcc.core.models import get_button_image
                     info = probe_led_model(dev.vid, dev.pid, usb_path=dev.usb_path)
                     if info and info.model_name:
                         model = info.model_name
                         led_style_id = info.style.style_id if info.style else None
-                        btn = PmRegistry.get_button_image(info.pm, info.sub_type)
+                        btn = get_button_image(info.pm, info.sub_type, is_led=True)
                         if btn:
                             button_image = btn
                 except Exception:

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/adapters/infra/data_repository.py

@@ -221,16 +221,15 @@ class DataManager:
         os.makedirs(os.path.dirname(dest_path), exist_ok=True)
         tmp_path = dest_path + '.tmp'
 
-        # PyInstaller sets SSL_CERT_FILE to a bundled cacert.pem that may
-        # not exist at runtime, causing certificate verification failures.
-        # Temporarily clear it so ssl.create_default_context() loads certs
-        # from the OS store (Windows) or system CA bundle instead.
-        stashed = os.environ.pop('SSL_CERT_FILE', None)
+        # macOS Python doesn't access the system Keychain for SSL certs,
+        # and PyInstaller bundles lack system CA paths. Use certifi's
+        # Mozilla CA bundle — works on all platforms and bundle types.
+        ctx = ssl.create_default_context()
         try:
-            ctx = ssl.create_default_context()
-        finally:
-            if stashed is not None:
-                os.environ['SSL_CERT_FILE'] = stashed
+            import certifi
+            ctx.load_verify_locations(certifi.where())
+        except ImportError:
+            pass
 
         try:
             log.info("Downloading %s ...", os.path.basename(dest_path))

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/adapters/system/config.py

@@ -121,8 +121,7 @@ class SysInfoConfig:
 
         Only fills sensors where sensor_id is empty (preserves user customizations).
         """
-        from .linux.sensors import map_defaults
-        defaults = map_defaults(enumerator)
+        defaults = enumerator.map_defaults()
 
         # Map category_id + row index to legacy metric key
         _LEGACY_KEYS = {

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/api/__init__.py

@@ -23,6 +23,11 @@ import logging
 import os
 import threading
 from pathlib import Path
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from trcc.core.device import Device
+    from trcc.ipc import DeviceProxy
 
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
@@ -55,9 +60,8 @@ _device_svc = DeviceService(
 # System service — None until configure_app() is called by trcc serve
 _system_svc: SystemService | None = None
 
-# Lazy-initialized devices (set when device is selected)
-_display_dispatcher = None  # Device | DisplayProxy | None
-_led_dispatcher = None      # Device | LEDProxy | None
+# Lazy-initialized device (set when device is selected)
+_device_dispatcher: Device | DeviceProxy | None = None
 
 # Last frame sent to LCD — updated by display/theme endpoints for preview
 _current_image = None  # QImage | None
@@ -129,7 +133,7 @@ def start_video_playback(
     _video_stop_event = threading.Event()
     stop_event = _video_stop_event  # Local ref for closure
 
-    lcd = _display_dispatcher  # capture for closure
+    lcd = _device_dispatcher  # capture for closure
 
     def _pump() -> None:
         interval = media.frame_interval_ms / 1000.0
@@ -201,7 +205,7 @@ def start_overlay_loop(
     _overlay_svc = overlay
     _overlay_stop_event = threading.Event()
     stop_event = _overlay_stop_event
-    lcd = _display_dispatcher  # capture for closure
+    lcd = _device_dispatcher  # capture for closure
 
     def _loop() -> None:
         while not stop_event.is_set():
@@ -249,7 +253,7 @@ def start_keepalive_loop(image, width: int, height: int) -> bool:
 
     _keepalive_stop_event = threading.Event()
     stop_event = _keepalive_stop_event
-    lcd = _display_dispatcher  # capture for closure
+    lcd = _device_dispatcher  # capture for closure
 
     def _loop() -> None:
         while not stop_event.is_set():
@@ -314,10 +318,10 @@ def start_screencast(
     stop_overlay_loop()
     stop_keepalive_loop()
 
-    if not _display_dispatcher or not _display_dispatcher.connected:
-        return {"success": False, "error": "No LCD device connected"}
+    if not _device_dispatcher or not _device_dispatcher.connected:
+        return {"success": False, "error": "No device connected"}
 
-    lcd = _display_dispatcher  # capture for closures
+    lcd = _device_dispatcher  # capture for closures
     lcd_w, lcd_h = lcd.resolution  # type: ignore[union-attr]
     _screencast_stop_event = threading.Event()
     stop_event = _screencast_stop_event
@@ -495,7 +499,7 @@ def mount_static_dirs(width: int, height: int) -> None:
     _mounted_routes.clear()
 
     # Read from device's orientation when available, fallback to resolve
-    o = getattr(_display_dispatcher, 'orientation', None) if _display_dispatcher else None
+    o = getattr(_device_dispatcher, 'orientation', None) if _device_dispatcher else None
     if o is not None and not hasattr(o, 'theme_dir'):
         o = None  # proxy/mock without real Orientation
     td = o.theme_dir if o else None

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/api/devices.py

@@ -70,7 +70,7 @@ def select_device(device_id: int) -> dict:
     already_active = (
         _device_svc.selected is not None
         and _device_svc.selected is dev
-        and (api._display_dispatcher or api._led_dispatcher)
+        and api._device_dispatcher
     )
     if already_active:
         return {"selected": dev.name, "resolution": dev.resolution}
@@ -83,16 +83,16 @@ def select_device(device_id: int) -> dict:
 
     # Check if another instance (GUI) already owns the device
     from trcc.core.instance import find_active
-    from trcc.ipc import create_lcd_proxy, create_led_proxy
+    from trcc.ipc import create_device_proxy
 
     active = find_active()
 
     if active is not None:
-        api._display_dispatcher = create_lcd_proxy(active)
-        api._led_dispatcher = create_led_proxy(active)
+        proxy = create_device_proxy(active)
+        api._device_dispatcher = proxy
 
         # Active instance already discovered resolution — sync to DeviceInfo
-        proxy_res = api._display_dispatcher.resolution
+        proxy_res = proxy.resolution
         if proxy_res != (0, 0):
             dev.resolution = proxy_res
 
@@ -105,29 +105,31 @@ def select_device(device_id: int) -> dict:
         app = TrccApp.get()
         app.discover(path=getattr(dev, 'path', None))
 
-        if app.has_led:
-            api._led_dispatcher = app.led_device
-        else:
+        device = None
+        if app.devices:
+            device = app.device(0)
+            api._device_dispatcher = device
+        elif getattr(dev, 'protocol', '') != 'led':
+            # LCD fallback — build from DeviceService when scan missed it
             _device_svc._discover_resolution(dev)
-            # Fallback: wire LCD from existing device service if discover didn't find one
-            if not app.has_lcd:
-                api._display_dispatcher = app.device_from_service(_device_svc)
-            else:
-                api._display_dispatcher = app.lcd_device
-
-            lcd = api._display_dispatcher
-            if lcd is None:
-                return {"selected": dev.name, "resolution": dev.resolution}
+            device = app.device_from_service(_device_svc)
+            if device and device.connected:
+                api._device_dispatcher = device
+
+        if device is None or not getattr(device, 'connected', False):
+            return {"selected": dev.name, "resolution": dev.resolution}
+
+        if device.is_lcd:
             w_res, h_res = dev.resolution or (0, 0)
 
             # Download/extract theme data for this resolution in background
-            if w_res and h_res and app.has_lcd and app.lcd_device is not None:
-                app._ensure_data_background(app.lcd_device, w_res, h_res)
+            if w_res and h_res:
+                app._ensure_data_background(device, w_res, h_res)
 
             api.set_current_image(ImageService.solid_color(0, 0, 0, w_res, h_res))
 
-            lcd.restore_device_settings()
-            result = lcd.restore_last_theme()
+            device.restore_device_settings()
+            result = device.restore_last_theme()
             if result.get("image"):
                 api.set_current_image(result["image"])
                 log.info("Restored last theme for preview")
@@ -159,14 +161,10 @@ async def send_image(device_id: int, image: UploadFile, rotation: int = 0,
     import tempfile
     from pathlib import Path
 
-    from trcc.core.app import TrccApp
+    from trcc.api.display import _get_display
 
     _get_device_by_id(device_id)  # validate device exists
-
-    app = TrccApp.get()
-    if not app.has_lcd:
-        raise HTTPException(status_code=409, detail="No LCD device connected")
-    lcd = app.lcd
+    lcd = _get_display()
 
     # Read and validate upload
     data = await image.read()

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/api/display.py

@@ -36,12 +36,12 @@ router = APIRouter(prefix="/display", tags=["display"])
 
 
 def _get_display():
-    """Get the active LCDDevice, raise 409 if not connected."""
-    from trcc.api import _display_dispatcher
+    """Get the active device, raise 409 if not connected."""
+    from trcc.api import _device_dispatcher
 
-    if not _display_dispatcher or not _display_dispatcher.connected:
-        raise HTTPException(status_code=409, detail="No LCD device selected. POST /devices/{id}/select first.")
-    return _display_dispatcher
+    if not _device_dispatcher or not _device_dispatcher.connected:
+        raise HTTPException(status_code=409, detail="No device selected. POST /devices/{id}/select first.")
+    return _device_dispatcher
 
 
 
@@ -49,52 +49,39 @@ def _get_display():
 def set_color(body: HexColorRequest) -> dict:
     """Send solid color to LCD."""
     from trcc.api import stop_overlay_loop, stop_video_playback
-    from trcc.core.app import TrccApp
 
     stop_video_playback()
     stop_overlay_loop()
     r, g, b = parse_hex_or_400(body.hex)
-    _get_display()
-    return dispatch_result(TrccApp.get().lcd.send_color(r, g, b))
+    return dispatch_result(_get_display().send_color(r, g, b))
 
 
 @router.post("/brightness")
 def set_brightness(body: BrightnessRequest) -> dict:
     """Set display brightness (1=25%, 2=50%, 3=100%). Persists to config."""
-    from trcc.core.app import TrccApp
-
-    _get_display()
-    return dispatch_result(TrccApp.get().lcd.set_brightness(body.level))
+    return dispatch_result(_get_display().set_brightness(body.level))
 
 
 @router.post("/rotation")
 def set_rotation(body: RotationRequest) -> dict:
     """Set display rotation (0, 90, 180, 270). Persists to config."""
-    from trcc.core.app import TrccApp
-
-    _get_display()
-    return dispatch_result(TrccApp.get().lcd.set_rotation(body.degrees))
+    return dispatch_result(_get_display().set_rotation(body.degrees))
 
 
 @router.post("/split")
 def set_split(body: SplitRequest) -> dict:
     """Set split mode (0=off, 1-3=Dynamic Island). Persists to config."""
-    from trcc.core.app import TrccApp
-
-    _get_display()
-    return dispatch_result(TrccApp.get().lcd.set_split_mode(body.mode))
+    return dispatch_result(_get_display().set_split_mode(body.mode))
 
 
 @router.post("/reset")
 def reset_display() -> dict:
     """Reset device by sending solid red frame."""
     from trcc.api import stop_overlay_loop, stop_video_playback
-    from trcc.core.app import TrccApp
 
     stop_video_playback()
     stop_overlay_loop()
-    _get_display()
-    return dispatch_result(TrccApp.get().lcd.reset())
+    return dispatch_result(_get_display().reset())
 
 
 @router.post("/mask")
@@ -115,8 +102,7 @@ async def load_mask(image: UploadFile) -> dict:
         tmp_path = tmp.name
 
     try:
-        from trcc.core.app import TrccApp
-        result = TrccApp.get().lcd.load_mask_standalone(tmp_path)
+        result = _get_display().load_mask_standalone(tmp_path)
         return dispatch_result(result)
     finally:
         Path(tmp_path).unlink(missing_ok=True)
@@ -139,22 +125,21 @@ async def render_overlay(dc_path: str, send: bool = True) -> dict:
     if not safe_path.startswith(allowed_dir + os.sep) and safe_path != allowed_dir:
         raise HTTPException(status_code=400, detail="Invalid overlay path")
 
-    from trcc.core.app import TrccApp
 
     _get_display()
-    result = TrccApp.get().lcd.render_overlay_from_dc(safe_path, send=send)
+    result = _get_display().render_overlay_from_dc(safe_path, send=send)
     return dispatch_result(result)
 
 
 @router.get("/status")
 def display_status() -> dict:
     """Get current display state — resolution, device path, connection."""
-    from trcc.api import _display_dispatcher
+    from trcc.api import _device_dispatcher
 
-    if not _display_dispatcher or not _display_dispatcher.connected:
+    if not _device_dispatcher or not _device_dispatcher.connected:
         return {"connected": False, "resolution": [0, 0], "device_path": None}
 
-    lcd = _display_dispatcher
+    lcd = _device_dispatcher
     return {
         "connected": True,
         "resolution": lcd.resolution,
@@ -237,10 +222,9 @@ def test_display() -> dict:
         (255, 255, 255, "White"),
     ]
 
-    from trcc.core.app import TrccApp
     from trcc.services import ImageService
 
-    lcd = TrccApp.get().lcd
+    lcd = _get_display()
     for r, g, b, _name in colors:
         img = ImageService.solid_color(r, g, b, w, h)
         lcd.send_color(r, g, b)
@@ -393,14 +377,12 @@ async def create_theme(
         raise HTTPException(status_code=400, detail="Failed to open background image")
 
     if mask_path:
-        from trcc.core.app import TrccApp
-        mask_result = TrccApp.get().lcd.load_mask_standalone(str(mask_path))
+        mask_result = _get_display().load_mask_standalone(str(mask_path))
         if not mask_result.get("success"):
             raise HTTPException(status_code=400, detail=mask_result.get("error", "Mask load failed"))
         img = mask_result.get("image", img)
 
-    from trcc.core.app import TrccApp
-    lcd_device = TrccApp.get().lcd
+    lcd_device = _get_display()
 
     # Load background into DisplayService state
     lcd_device.load_image(bg_path)
@@ -506,9 +488,9 @@ def _get_lcd_frame():
 
     Returns the raw frame object (QImage or pre-encoded bytes).
     """
-    from trcc.api import _current_image, _display_dispatcher
+    from trcc.api import _current_image, _device_dispatcher
 
-    if getattr(_display_dispatcher, 'is_ipc', False):
+    if getattr(_device_dispatcher, 'is_ipc', False):
         return _fetch_ipc_frame()
     return _current_image
 
@@ -544,7 +526,7 @@ async def preview_stream(websocket: WebSocket):
     Auth: ``?token=`` query param (checked against configured API token).
     Client control: send JSON ``{"fps": N}``, ``{"quality": N}``, ``{"pause": bool}``.
     """
-    from trcc.api import _api_token, _display_dispatcher
+    from trcc.api import _api_token, _device_dispatcher
 
     # ── Auth ──────────────────────────────────────────────────────────
     if _api_token:
@@ -555,7 +537,7 @@ async def preview_stream(websocket: WebSocket):
 
     await websocket.accept()
 
-    use_ipc = getattr(_display_dispatcher, 'is_ipc', False)
+    use_ipc = getattr(_device_dispatcher, 'is_ipc', False)
     fps = 10
     quality = 85
     paused = False

{trcc_linux-9.4.0 → trcc_linux-9.4.2}/src/trcc/api/led.py

@@ -24,19 +24,17 @@ router = APIRouter(prefix="/led", tags=["led"])
 
 
 def _get_led():
-    """Get the active LEDDevice, raise 409 if not connected."""
-    from trcc.api import _led_dispatcher
+    """Get the active device, raise 409 if not connected."""
+    from trcc.api import _device_dispatcher
 
-    if not _led_dispatcher or not _led_dispatcher.connected:
-        raise HTTPException(status_code=409, detail="No LED device selected. POST /devices/{id}/select first.")
-    return _led_dispatcher
+    if not _device_dispatcher or not _device_dispatcher.connected:
+        raise HTTPException(status_code=409, detail="No device selected. POST /devices/{id}/select first.")
+    return _device_dispatcher
 
 
 def _led():
-    """Get LED Device from TrccApp. Raises 409 if not connected."""
-    from trcc.core.app import TrccApp
-    _get_led()
-    return TrccApp.get().led
+    """Get Device. Raises 409 if not connected."""
+    return _get_led()
 
 
 # ── Global operations ──────────────────────────────────────────────────
@@ -205,12 +203,12 @@ def test_led(
 @router.get("/status")
 def led_status() -> dict:
     """Get current LED state — connected, init status."""
-    from trcc.api import _led_dispatcher
+    from trcc.api import _device_dispatcher
 
-    if not _led_dispatcher or not _led_dispatcher.connected:
+    if not _device_dispatcher or not _device_dispatcher.connected:
         return {"connected": False, "status": None}
 
-    led = _led_dispatcher
+    led = _device_dispatcher
     return {
         "connected": True,
         "status": led.status,