trcc-linux 8.2.6__tar.gz → 8.2.9__tar.gz

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/.gitignore

@@ -81,7 +81,6 @@ src/trcc/data/ui_*.json
 /probe_*.py
 /*.sh
 !install.sh
-!setup.sh
 
 # Dev tooling
 tools/

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 8.2.6
+Version: 8.2.9
 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
@@ -69,7 +69,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-4653_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-4658_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-74%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/)
@@ -111,6 +111,10 @@ Native Linux port of the Thermalright LCD Control Center (Windows TRCC 2.1.2). C
 
 Run `trcc report` and [paste the output in an issue](https://github.com/Lexonight1/thermalright-trcc-linux/issues/new) — takes 30 seconds. See the **[full list of devices that need testers](doc/TESTERS_WANTED.md)**.
 
+### Something not working?
+
+**[Open a GitHub issue](https://github.com/Lexonight1/thermalright-trcc-linux/issues/new)** — that's the only place I see bug reports. I don't monitor Reddit, forums, or Discussions. Run `trcc report`, paste the output, and I'll get back to you.
+
 ![TRCC Linux GUI](doc/screenshots/screenshot.png)
 
 ## Features
@@ -173,29 +177,23 @@ Run `lsusb` to find your USB ID (`xxxx:xxxx` after `ID`), then match it below.
 
 Pre-built packages are available for every major distro. No pip, no venv, no PEP 668 headaches — just download and install like any other app. Every release is built automatically from source using [GitHub Actions](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/release.yml) — the build logs are public so anyone can verify what went in.
 
-**Step 1:** Go to the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and download the package for your distro.
-
 > Not sure which distro you're running? Open a terminal and type `cat /etc/os-release` — the `ID` line tells you.
 
-**Step 2:** Open a terminal in your Downloads folder and install:
-
 **Fedora / openSUSE / Nobara:**
 ```bash
-cd ~/Downloads
-sudo dnf install ./trcc-linux-*.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.2.9-1.fc43.noarch.rpm
 ```
 
 **Ubuntu / Debian / Mint / Pop!_OS / Zorin:**
 ```bash
-cd ~/Downloads
-sudo dpkg -i trcc-linux_*_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.2.9-1_all.deb
+sudo dpkg -i trcc-linux_8.2.9-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-cd ~/Downloads
-sudo pacman -U trcc-linux-*-any.pkg.tar.zst
+sudo pacman -U https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.2.9-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -240,14 +238,6 @@ Then **unplug and replug the USB cable** and run `trcc gui`.
 
 > `pipx` not installed? `sudo apt install pipx` (Debian/Ubuntu), `sudo dnf install pipx` (Fedora), `sudo pacman -S python-pipx` (Arch). See the **[Install Guide](doc/INSTALL_GUIDE.md)** for your distro.
 
-### One-line bootstrap
-
-```bash
-bash <(curl -sSL https://raw.githubusercontent.com/Lexonight1/thermalright-trcc-linux/main/setup.sh)
-```
-
-Downloads and installs trcc-linux, then launches the setup wizard.
-
 ### Automatic (git clone)
 
 ```bash
@@ -414,7 +404,7 @@ A big thanks to everyone who has contributed invaluable reports to this project:
 
 Thanks to everyone who took a moment to star this project — it means the world.
 
-**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[Rehaell](https://github.com/Rehaell)** · **[rslater](https://github.com/rslater)** · **[Smokemic](https://github.com/Smokemic)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
+**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[Rehaell](https://github.com/Rehaell)** · **[rslater](https://github.com/rslater)** · **[Smokemic](https://github.com/Smokemic)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
 
 ## Faulkers
 

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/README.md

@@ -10,7 +10,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-4653_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-4658_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-74%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/)
@@ -52,6 +52,10 @@ Native Linux port of the Thermalright LCD Control Center (Windows TRCC 2.1.2). C
 
 Run `trcc report` and [paste the output in an issue](https://github.com/Lexonight1/thermalright-trcc-linux/issues/new) — takes 30 seconds. See the **[full list of devices that need testers](doc/TESTERS_WANTED.md)**.
 
+### Something not working?
+
+**[Open a GitHub issue](https://github.com/Lexonight1/thermalright-trcc-linux/issues/new)** — that's the only place I see bug reports. I don't monitor Reddit, forums, or Discussions. Run `trcc report`, paste the output, and I'll get back to you.
+
 ![TRCC Linux GUI](doc/screenshots/screenshot.png)
 
 ## Features
@@ -114,29 +118,23 @@ Run `lsusb` to find your USB ID (`xxxx:xxxx` after `ID`), then match it below.
 
 Pre-built packages are available for every major distro. No pip, no venv, no PEP 668 headaches — just download and install like any other app. Every release is built automatically from source using [GitHub Actions](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/release.yml) — the build logs are public so anyone can verify what went in.
 
-**Step 1:** Go to the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and download the package for your distro.
-
 > Not sure which distro you're running? Open a terminal and type `cat /etc/os-release` — the `ID` line tells you.
 
-**Step 2:** Open a terminal in your Downloads folder and install:
-
 **Fedora / openSUSE / Nobara:**
 ```bash
-cd ~/Downloads
-sudo dnf install ./trcc-linux-*.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.2.9-1.fc43.noarch.rpm
 ```
 
 **Ubuntu / Debian / Mint / Pop!_OS / Zorin:**
 ```bash
-cd ~/Downloads
-sudo dpkg -i trcc-linux_*_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.2.9-1_all.deb
+sudo dpkg -i trcc-linux_8.2.9-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-cd ~/Downloads
-sudo pacman -U trcc-linux-*-any.pkg.tar.zst
+sudo pacman -U https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.2.9-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -181,14 +179,6 @@ Then **unplug and replug the USB cable** and run `trcc gui`.
 
 > `pipx` not installed? `sudo apt install pipx` (Debian/Ubuntu), `sudo dnf install pipx` (Fedora), `sudo pacman -S python-pipx` (Arch). See the **[Install Guide](doc/INSTALL_GUIDE.md)** for your distro.
 
-### One-line bootstrap
-
-```bash
-bash <(curl -sSL https://raw.githubusercontent.com/Lexonight1/thermalright-trcc-linux/main/setup.sh)
-```
-
-Downloads and installs trcc-linux, then launches the setup wizard.
-
 ### Automatic (git clone)
 
 ```bash
@@ -355,7 +345,7 @@ A big thanks to everyone who has contributed invaluable reports to this project:
 
 Thanks to everyone who took a moment to star this project — it means the world.
 
-**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[Rehaell](https://github.com/Rehaell)** · **[rslater](https://github.com/rslater)** · **[Smokemic](https://github.com/Smokemic)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
+**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[Rehaell](https://github.com/Rehaell)** · **[rslater](https://github.com/rslater)** · **[Smokemic](https://github.com/Smokemic)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
 
 ## Faulkers
 

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/pyproject.toml

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

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/__init__.py

@@ -34,7 +34,8 @@ from trcc.adapters.infra.dc_parser import dc_to_overlay_config, parse_dc_file
 
 # Animation
 from trcc.adapters.infra.media_player import VideoDecoder
-from trcc.services.system import format_metric, get_all_metrics
+from trcc.core.models import format_metric
+from trcc.services.system import get_all_metrics
 
 __all__ = [
     # Version

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/__version__.py

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

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/api/__init__.py

@@ -34,8 +34,10 @@ from trcc.adapters.device.led import probe_led_model
 from trcc.adapters.infra.dc_config import DcConfig
 from trcc.adapters.infra.dc_parser import load_config_json
 from trcc.adapters.render.qt import QtRenderer
+from trcc.adapters.system.sensors import SensorEnumerator
 from trcc.services import DeviceService, MediaService, OverlayService
 from trcc.services.image import ImageService
+from trcc.services.system import SystemService, set_instance
 
 log = logging.getLogger(__name__)
 
@@ -57,10 +59,13 @@ _device_svc = DeviceService(
     get_protocol_info=DeviceProtocolFactory.get_protocol_info,
 )
 
+# System service (composition root — adapter wired here)
+_system_svc = SystemService(enumerator=SensorEnumerator())
+set_instance(_system_svc)
+
 # Lazy-initialized devices (set when device is selected)
 _display_dispatcher = None  # LCDDevice | None
 _led_dispatcher = None      # LEDDevice | None
-_system_svc = None          # SystemService | None
 
 # Last frame sent to LCD — updated by display/theme endpoints for preview
 _current_image = None  # QImage | PIL Image | None
@@ -177,10 +182,8 @@ def start_overlay_loop(
     stop_event = _overlay_stop_event
 
     def _loop() -> None:
-        from trcc.services.system import get_all_metrics
-
         while not stop_event.is_set():
-            metrics = get_all_metrics()
+            metrics = _system_svc.all_metrics
             if overlay.would_change(metrics):
                 overlay.update_metrics(metrics)
                 frame = overlay.render(metrics=metrics)

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/api/devices.py

@@ -117,11 +117,17 @@ def select_device(device_id: int) -> dict:
 
             from trcc.core.lcd_device import LCDDevice
 
-            api._display_dispatcher = LCDDevice(device_svc=_device_svc)
+            lcd = LCDDevice.from_service(_device_svc)
+            api._display_dispatcher = lcd
 
             w_res, h_res = dev.resolution or (320, 320)
             api.set_current_image(ImageService.solid_color(0, 0, 0, w_res, h_res))
-            _restore_last_theme(dev)
+
+            lcd.restore_device_settings()
+            result = lcd.load_last_theme()
+            if result.get("image"):
+                api.set_current_image(result["image"])
+                log.info("Restored last theme for preview")
 
     # Mount static file directories for this device's resolution
     w, h = dev.resolution or (0, 0)
@@ -131,47 +137,6 @@ def select_device(device_id: int) -> dict:
     return {"selected": dev.name, "resolution": dev.resolution}
 
 
-def _restore_last_theme(dev) -> None:
-    """Load saved theme image into _current_image (for preview/stream).
-
-    Mirrors CLI --last-one: reads theme_path from device config, opens
-    00.png, applies brightness + rotation. Does NOT re-send to device.
-    """
-    import os
-
-    from trcc.api import set_current_image
-    from trcc.conf import Settings
-
-    key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
-    cfg = Settings.get_device_config(key)
-    theme_path = cfg.get("theme_path")
-    if not theme_path:
-        return
-
-    image_path = None
-    if os.path.isdir(theme_path):
-        candidate = os.path.join(theme_path, "00.png")
-        if os.path.exists(candidate):
-            image_path = candidate
-    elif os.path.isfile(theme_path):
-        image_path = theme_path
-
-    if not image_path:
-        return
-
-    try:
-        w, h = dev.resolution
-        img = ImageService.open_and_resize(image_path, w, h)
-
-        brightness_pct = {1: 25, 2: 50, 3: 100}.get(cfg.get("brightness_level", 3), 100)
-        img = ImageService.apply_brightness(img, brightness_pct)
-        img = ImageService.apply_rotation(img, cfg.get("rotation", 0))
-
-        set_current_image(img)
-        log.info("Restored last theme for preview: %s", os.path.basename(theme_path))
-    except Exception as e:
-        log.debug("Could not restore last theme: %s", e)
-
 
 @router.get("/devices/{device_id}")
 def get_device(device_id: int) -> DeviceResponse:

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/api/display.py

@@ -122,8 +122,11 @@ 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")
 
+    import trcc.api as api
+
     lcd = _get_display()
-    result = lcd.render_overlay_from_dc(safe_path, send=send)
+    result = lcd.render_overlay_from_dc(
+        safe_path, send=send, metrics=api._system_svc.all_metrics)
     return dispatch_result(result)
 
 

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/api/system.py

@@ -12,14 +12,8 @@ router = APIRouter(prefix="/system", tags=["system"])
 
 
 def _get_system_svc():
-    """Get or create the shared SystemService instance."""
+    """Get the shared SystemService instance (initialized in api/__init__.py)."""
     import trcc.api as api
-    from trcc.services import SystemService
-
-    if api._system_svc is None:
-        from trcc.adapters.system.sensors import SensorEnumerator
-
-        api._system_svc = SystemService(enumerator=SensorEnumerator())
     return api._system_svc
 
 

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/cli/__init__.py

@@ -33,6 +33,15 @@ def _ensure_renderer() -> None:
         ImageService.set_renderer(QtRenderer())
 
 
+def _ensure_system() -> None:
+    """Initialize SystemService singleton for CLI (once)."""
+    from trcc.services.system import _instance
+    if _instance is None:
+        from trcc.core.builder import ControllerBuilder
+        from trcc.services.system import set_instance
+        set_instance(ControllerBuilder().build_system())
+
+
 def _cli_handler(func):
     """Decorator: catches Exception, prints error, returns 1."""
     @functools.wraps(func)

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/cli/_display.py

@@ -313,10 +313,15 @@ def load_mask(mask_path, *, device=None, preview=False):
 def render_overlay(dc_path, *, device=None, send=False, output=None,
                    preview=False):
     """Render overlay from DC config file."""
+    from trcc.cli import _ensure_system
+    from trcc.services.system import get_all_metrics
+
     lcd, rc = _connect_or_fail(device)
     if rc:
         return rc
-    result = lcd.render_overlay_from_dc(dc_path, send=send, output=output)
+    _ensure_system()
+    result = lcd.render_overlay_from_dc(
+        dc_path, send=send, output=output, metrics=get_all_metrics())
     if not result["success"]:
         print(f"Error: {result['error']}")
         return 1
@@ -364,8 +369,8 @@ def resume():
     from trcc.adapters.device.detector import DeviceDetector
     from trcc.adapters.device.factory import DeviceProtocolFactory
     from trcc.adapters.device.led import probe_led_model
-    from trcc.conf import Settings
-    from trcc.services import DeviceService, ImageService
+    from trcc.core.lcd_device import LCDDevice
+    from trcc.services import DeviceService
 
     svc = DeviceService(
         detect_fn=DeviceDetector.detect,
@@ -396,40 +401,18 @@ def resume():
         if dev.resolution == (0, 0):
             continue
 
-        key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
-        cfg = Settings.get_device_config(key)
-        theme_path = cfg.get("theme_path")
-
-        if not theme_path:
-            print(f"  [{dev.product}] No saved theme, skipping")
-            continue
-
-        image_path = None
-        if os.path.isdir(theme_path):
-            candidate = os.path.join(theme_path, "00.png")
-            if os.path.exists(candidate):
-                image_path = candidate
-        elif os.path.isfile(theme_path):
-            image_path = theme_path
-
-        if not image_path:
-            print(f"  [{dev.product}] Theme not found: {theme_path}")
-            continue
-
         try:
-            w, h = dev.resolution
-            img = ImageService.open_and_resize(image_path, w, h)
-
-            brightness_level = cfg.get("brightness_level", 3)
-            brightness_pct = {1: 25, 2: 50, 3: 100}.get(brightness_level, 100)
-            img = ImageService.apply_brightness(img, brightness_pct)
-
-            rotation = cfg.get("rotation", 0)
-            img = ImageService.apply_rotation(img, rotation)
-
             svc.select(dev)
-            svc.send_pil(img, w, h)
-            print(f"  [{dev.product}] Sent: {os.path.basename(theme_path)}")
+            lcd = LCDDevice.from_service(svc)
+            lcd.restore_device_settings()
+            result = lcd.load_last_theme()
+            if not result.get("success"):
+                msg = result.get("error", "Unknown error")
+                print(f"  [{dev.product}] {msg}")
+                continue
+            img = result["image"]
+            lcd.send(img)
+            print(f"  [{dev.product}] Sent")
             sent += 1
         except Exception as e:
             print(f"  [{dev.product}] Error: {e}")

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/cli/_led.py

@@ -202,10 +202,10 @@ def test_led(*, mode: str | None = None, segments: int = 64,
     """Test LED ANSI preview with real system metrics. No device needed."""
     import time
 
-    from trcc.adapters.system.sensors import SensorEnumerator
+    from trcc.cli import _ensure_system
     from trcc.core.models import LEDMode, LEDState
     from trcc.services.led import LEDService
-    from trcc.services.system import SystemService
+    from trcc.services.system import get_instance
 
     modes = {
         'static': LEDMode.STATIC,
@@ -223,8 +223,8 @@ def test_led(*, mode: str | None = None, segments: int = 64,
     else:
         run_modes = modes
 
-    sys_svc = SystemService(enumerator=SensorEnumerator())
-    sys_svc.discover()
+    _ensure_system()
+    sys_svc = get_instance()
     metrics = sys_svc.all_metrics
 
     print(f"LED ANSI Preview ({segments} segments)")
@@ -277,12 +277,12 @@ def test_led(*, mode: str | None = None, segments: int = 64,
 
 def test_lcd(*, cols: int = 60):
     """Test LCD ANSI preview with real system metrics. No device needed."""
-    from trcc.adapters.system.sensors import SensorEnumerator
+    from trcc.cli import _ensure_system
     from trcc.services.image import ImageService
-    from trcc.services.system import SystemService
+    from trcc.services.system import get_instance
 
-    sys_svc = SystemService(enumerator=SensorEnumerator())
-    sys_svc.discover()
+    _ensure_system()
+    sys_svc = get_instance()
     metrics = sys_svc.all_metrics
 
     print(f"LCD ANSI Preview ({cols} cols)")

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/cli/_system.py

@@ -69,8 +69,10 @@ def show_info(*, preview: bool = False, metric: str | None = None):
         metric: Filter to a group — cpu, gpu, mem, disk, net, fan, time.
     """
     try:
+        from trcc.cli import _ensure_system
         from trcc.services.system import format_metric, get_all_metrics
 
+        _ensure_system()
         metrics = get_all_metrics()
 
         if preview:

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/cli/_theme.py

@@ -82,23 +82,19 @@ def load_theme(name, *, device=None, preview=False):
         return 0
 
     if match.background_path and match.background_path.exists():
-        img = ImageService.open_and_resize(match.background_path, w, h)
-
-        # Apply saved adjustments
-        key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
-        cfg = Settings.get_device_config(key)
-        brightness = {1: 25, 2: 50, 3: 100}.get(
-            cfg.get('brightness_level', 3), 100)
-        rotation = cfg.get('rotation', 0)
-        img = ImageService.apply_brightness(img, brightness)
-        img = ImageService.apply_rotation(img, rotation)
-
-        svc.send_pil(img, w, h)
+        from trcc.core.lcd_device import LCDDevice
+        lcd = LCDDevice.from_service(svc)
+        lcd.restore_device_settings()
+        result = lcd.load_image(match.background_path)
+        img = result.get("image")
+        if img:
+            lcd.send(img)
 
         # Save as last-used theme
+        key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
         Settings.save_device_setting(key, 'theme_path', str(match.path))
         print(f"Loaded '{match.name}' → {dev.path}")
-        if preview:
+        if preview and img:
             print(ImageService.to_ansi(img))
     else:
         print(f"Theme '{match.name}' has no background image.")

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/conf.py

@@ -16,8 +16,8 @@ Usage:
     settings.lang           # Language suffix ('en', 'd', 'e', 'f', 'p', 'r', 'x', '', 'tc')
 
     # Static settings operations
-    Settings.device_config_key(0, 0x87cd, 0x70db)
-    Settings.get_device_config(key)
+    Settings.device_config_key(0, 0x87cd, 0x70db)  # returns "0"
+    Settings.get_device_config(key)  # {"vid_pid": "87cd_70db", ...}
     Settings.save_device_setting(key, 'theme', 'dark')
 
     # Low-level config access (module-level)
@@ -78,14 +78,44 @@ def _migrate_old_config() -> None:
     log.info("Migrated config from %s to %s", old_dir, CONFIG_DIR)
 
 
+def _migrate_device_keys(config: dict) -> bool:
+    """Migrate device keys from '0:vid_pid' to '0' with vid_pid inside dict.
+
+    Old format: {"devices": {"0:0402_3922": {"brightness_level": 3}}}
+    New format: {"devices": {"0": {"vid_pid": "0402_3922", "brightness_level": 3}}}
+
+    Returns True if migration was performed.
+    """
+    devices = config.get('devices')
+    if not devices or not isinstance(devices, dict):
+        return False
+    migrated = {}
+    changed = False
+    for key, value in devices.items():
+        if ':' in key:
+            index, vid_pid = key.split(':', 1)
+            if isinstance(value, dict):
+                value['vid_pid'] = vid_pid
+            migrated[index] = value
+            changed = True
+        else:
+            migrated[key] = value
+    if changed:
+        config['devices'] = migrated
+    return changed
+
+
 def load_config() -> dict:
     """Load user config from disk. Returns empty dict on missing/corrupt file."""
     _migrate_old_config()
     try:
         with open(CONFIG_PATH, 'r') as f:
-            return json.load(f)
+            config = json.load(f)
     except (FileNotFoundError, json.JSONDecodeError, OSError):
         return {}
+    if _migrate_device_keys(config):
+        save_config(config)
+    return config
 
 
 def save_config(config: dict):
@@ -258,10 +288,19 @@ class Settings:
         config['selected_device'] = device_path
         save_config(config)
 
+    # Cache vid_pid per index so save_device_setting can store it automatically
+    _vid_pid_cache: dict[str, str] = {}
+
     @staticmethod
     def device_config_key(index: int, vid: int, pid: int) -> str:
-        """Build per-device config key, e.g. '0:87cd_70db'."""
-        return f"{index}:{vid:04x}_{pid:04x}"
+        """Build per-device config key (index only).
+
+        Config format: {"devices": {"0": {"vid_pid": "0402_3922", ...}}}
+        The vid_pid is stored inside the device dict, not in the key.
+        """
+        key = str(index)
+        Settings._vid_pid_cache[key] = f"{vid:04x}_{pid:04x}"
+        return key
 
     @staticmethod
     def get_device_config(key: str) -> dict:
@@ -274,6 +313,9 @@ class Settings:
         config = load_config()
         devices = config.setdefault('devices', {})
         dev_cfg = devices.setdefault(key, {})
+        # Store vid_pid on first write (from device_config_key cache)
+        if 'vid_pid' not in dev_cfg and key in Settings._vid_pid_cache:
+            dev_cfg['vid_pid'] = Settings._vid_pid_cache[key]
         dev_cfg[setting] = value
         save_config(config)
 

{trcc_linux-8.2.6 → trcc_linux-8.2.9}/src/trcc/core/builder.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING
 from .ports import Renderer
 
 if TYPE_CHECKING:
+    from ..services.system import SystemService
     from .lcd_device import LCDDevice
     from .led_device import LEDDevice
 
@@ -125,6 +126,13 @@ class ControllerBuilder:
 
         return lcd
 
+    def build_system(self) -> SystemService:
+        """Build and return a SystemService with injected enumerator."""
+        from ..adapters.system.sensors import SensorEnumerator
+        from ..services.system import SystemService
+
+        return SystemService(enumerator=SensorEnumerator())
+
     def build_led(self) -> LEDDevice:
         """Build and return a LEDDevice.