trcc-linux 9.2.1__tar.gz → 9.2.2__tar.gz

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 9.2.1
+Version: 9.2.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

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/pyproject.toml

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

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/__version__.py

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

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/adapters/render/qt.py

@@ -122,18 +122,26 @@ class QtRenderer(Renderer):
         painter.end()
 
     def get_font(self, size: int, bold: bool = False,
+                 italic: bool = False,
                  font_name: str | None = None) -> Any:
-        key = (size, bold, font_name)
+        key = (size, bold, italic, font_name)
         if key in self._font_cache:
             return self._font_cache[key]
 
-        font = self._resolve_font(size, bold, font_name)
+        font = self._resolve_font(size, bold, italic, font_name)
         self._font_cache[key] = font
         return font
 
     def _resolve_font(self, size: int, bold: bool,
+                      italic: bool,
                       font_name: str | None) -> QFont:
         """Resolve font name → QFont with the same fallback chain as FontResolver."""
+        def _apply(f: QFont) -> QFont:
+            f.setPixelSize(size)
+            f.setBold(bold)
+            f.setItalic(italic)
+            return f
+
         # User-specified font name
         if font_name and font_name != 'Microsoft YaHei':
             path = self._resolve_font_path(font_name, bold)
@@ -142,10 +150,7 @@ class QtRenderer(Renderer):
                 if font_id >= 0:
                     families = QFontDatabase.applicationFontFamilies(font_id)
                     if families:
-                        f = QFont(families[0])
-                        f.setPixelSize(size)
-                        f.setBold(bold)
-                        return f
+                        return _apply(QFont(families[0]))
 
         # Search bundled + system fonts
         bold_suffix = '-Bold' if bold else ''
@@ -165,19 +170,12 @@ class QtRenderer(Renderer):
                 if os.path.exists(path):
                     font_id = QFontDatabase.addApplicationFont(path)
                     if font_id >= 0:
-                        families = QFontDatabase.applicationFontFamilies(
-                            font_id)
+                        families = QFontDatabase.applicationFontFamilies(font_id)
                         if families:
-                            f = QFont(families[0])
-                            f.setPixelSize(size)
-                            f.setBold(bold)
-                            return f
+                            return _apply(QFont(families[0]))
 
         # Fallback: Qt default sans-serif
-        f = QFont('Sans')
-        f.setPixelSize(size)
-        f.setBold(bold)
-        return f
+        return _apply(QFont('Sans'))
 
     def _resolve_font_path(self, font_name: str,
                            bold: bool) -> str | None:

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/adapters/system/linux/setup.py

@@ -525,6 +525,18 @@ class LinuxSetup(PlatformSetup):
             "/etc/polkit-1/rules.d/50-trcc.rules",
         ]
 
+    def setup_udev(self, dry_run: bool = False) -> int:
+        return setup_udev(dry_run=dry_run)
+
+    def setup_selinux(self) -> int:
+        return setup_selinux()
+
+    def setup_polkit(self) -> int:
+        return setup_polkit()
+
+    def install_desktop(self) -> int:
+        return install_desktop()
+
     def acquire_instance_lock(self) -> object | None:
         return _posix_acquire_instance_lock(self.config_dir())
 

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/adapters/system/windows/setup.py

@@ -93,6 +93,36 @@ class WindowsSetup(PlatformSetup):
     def supports_winusb(self) -> bool:
         return True
 
+    def setup_winusb(self) -> int:
+        """Print Zadig-based WinUSB driver installation guide."""
+        from trcc.core.models import BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES
+
+        winusb_vids: set[tuple[int, int]] = set()
+        for registry in (BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES):
+            for vid, pid in registry:
+                winusb_vids.add((vid, pid))
+
+        print("\n  TRCC WinUSB Driver Setup\n")
+        print("  SCSI devices (Frozen Warframe, Elite Vision, CZTV, etc.)")
+        print("  use the default USB Mass Storage driver — no setup needed.\n")
+        print("  HID, Bulk, and LY devices need the WinUSB driver.")
+        print("  Install it using Zadig (free, open-source):\n")
+        print("  1. Download Zadig: https://zadig.akeo.ie/")
+        print("  2. Run Zadig → Options → List All Devices")
+        print("  3. Select your Thermalright device from the dropdown")
+        print("  4. Set target driver to WinUSB")
+        print("  5. Click 'Replace Driver' (or 'Install Driver')")
+        print("  6. Replug the USB device\n")
+        print("  Devices that need WinUSB:")
+        for vid, pid in sorted(winusb_vids):
+            for registry in (BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES):
+                if (vid, pid) in registry:
+                    entry = registry[(vid, pid)]
+                    print(f"    {vid:04X}:{pid:04X}  {entry.product}")
+                    break
+        print()
+        return 0
+
     def configure_stdout(self) -> None:
         """Force UTF-8 on Windows console stdout/stderr."""
         import io

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/api/devices.py

@@ -121,9 +121,14 @@ def select_device(device_id: int) -> dict:
                 return {"selected": dev.name, "resolution": dev.resolution}
             w_res, h_res = dev.resolution or (320, 320)
 
-            # Download/extract theme data for this resolution (no-op if cached)
-            from trcc.adapters.infra.data_repository import DataManager
-            DataManager.ensure_all(w_res, h_res)
+            # Download/extract theme data for this resolution via command bus
+            # (lcd_bus may not be wired yet in edge-case fallback paths — skip gracefully)
+            from trcc.core.app import TrccApp
+            from trcc.core.commands.lcd import EnsureDataCommand
+            try:
+                TrccApp.get().lcd_bus.dispatch(EnsureDataCommand(width=w_res, height=h_res))
+            except RuntimeError:
+                pass
 
             api.set_current_image(ImageService.solid_color(0, 0, 0, w_res, h_res))
 

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/api/i18n.py

@@ -33,13 +33,14 @@ def set_language(code: str) -> dict:
     """Set the application language by ISO 639-1 code."""
     from fastapi import HTTPException
 
-    from trcc.conf import settings
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetLanguageCommand
     from trcc.core.i18n import LANGUAGE_NAMES
 
-    if code not in LANGUAGE_NAMES:
+    result = TrccApp.get().os_bus.dispatch(SetLanguageCommand(code=code))
+    if not result.success:
         raise HTTPException(
             status_code=400,
             detail=f"Unknown language code '{code}'. Use GET /i18n/languages for valid codes.",
         )
-    settings.lang = code
-    return {"code": code, "name": LANGUAGE_NAMES[code]}
+    return {"code": code, "name": LANGUAGE_NAMES.get(code, code)}

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/api/themes.py

@@ -51,10 +51,12 @@ def init_theme_data(resolution: str = "320x320") -> dict:
 
     Safe to call repeatedly — no-op if data is already cached.
     Designed for remote apps to call on startup before listing themes.
+    Works regardless of whether a device is connected.
     """
+    from trcc.adapters.infra.data_repository import DataManager
+
     w, h = _parse_resolution(resolution)
 
-    from trcc.adapters.infra.data_repository import DataManager
     DataManager.ensure_all(w, h)
 
     # Remount static dirs now that data exists on disk
@@ -71,8 +73,7 @@ def list_themes(resolution: str = "320x320") -> list[ThemeResponse]:
 
     from pathlib import Path
 
-    from trcc.adapters.infra.data_repository import DataManager, ThemeDir
-    DataManager.ensure_themes(w, h)
+    from trcc.adapters.infra.data_repository import ThemeDir
     td = ThemeDir.for_resolution(w, h)
     theme_dir = Path(str(td))
     themes = ThemeService.discover_local(theme_dir, (w, h))
@@ -94,7 +95,6 @@ def list_web_themes(resolution: str = "320x320") -> list[WebThemeResponse]:
     w, h = _parse_resolution(resolution)
 
     from trcc.adapters.infra.data_repository import DataManager
-    DataManager.ensure_web(w, h)
     web_dir = DataManager.get_web_dir(w, h)
 
     results: list[WebThemeResponse] = []
@@ -185,7 +185,6 @@ def list_masks(resolution: str = "320x320") -> list[MaskResponse]:
     w, h = _parse_resolution(resolution)
 
     from trcc.adapters.infra.data_repository import DataManager
-    DataManager.ensure_web_masks(w, h)
     masks_dir = DataManager.get_web_masks_dir(w, h)
 
     results: list[MaskResponse] = []
@@ -305,8 +304,7 @@ def export_theme(theme_name: str, resolution: str = "320x320") -> Response:
 
     w, h = _parse_resolution(resolution)
 
-    from trcc.adapters.infra.data_repository import DataManager, ThemeDir
-    DataManager.ensure_themes(w, h)
+    from trcc.adapters.infra.data_repository import ThemeDir
     td = ThemeDir.for_resolution(w, h)
     theme_dir = Path(str(td))
 

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/__init__.py

@@ -1175,7 +1175,6 @@ select_device = _device.select
 # Backward-compat for tests and external consumers
 _probe_device = _device._probe
 _format_device = _device._format
-_ensure_extracted = _device._ensure_extracted
 _get_service = _device._get_service
 discover_resolution = _device.discover_resolution
 send_image = _display.send_image

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/_device.py

@@ -40,15 +40,6 @@ def discover_resolution(dev) -> None:
     svc._discover_resolution(dev)
 
 
-def _ensure_extracted(driver):
-    """Extract theme/mask archives for the driver's detected resolution (one-time)."""
-    try:
-        if driver.implementation:
-            w, h = driver.implementation.resolution
-            from trcc.adapters.infra.data_repository import DataManager
-            DataManager.ensure_all(w, h)
-    except Exception:
-        pass  # Non-fatal — themes are optional for CLI commands
 
 
 

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/_i18n.py

@@ -30,13 +30,14 @@ def get_language():
 @_cli_handler
 def set_language(code: str):
     """Set the application language by ISO 639-1 code."""
-    from trcc.conf import settings
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetLanguageCommand
     from trcc.core.i18n import LANGUAGE_NAMES
 
-    if code not in LANGUAGE_NAMES:
+    result = TrccApp.get().os_bus.dispatch(SetLanguageCommand(code=code))
+    if not result.success:
         print(f"Unknown language code '{code}'.")
         print("Use 'trcc lang-list' to see valid codes.")
         return 1
-    settings.lang = code
-    print(f"Language set to {code} ({LANGUAGE_NAMES[code]})")
+    print(f"Language set to {code} ({LANGUAGE_NAMES.get(code, code)})")
     return 0

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/_led.py

@@ -44,15 +44,14 @@ def _print_result(result: dict, *, preview: bool = False) -> int:
     return 0
 
 
-def _led_command(builder, method: str, *args, preview: bool = False, **kwargs) -> int:
-    """Generic: connect LED, call device method, print result."""
+def _led_dispatch(cmd_cls, preview: bool = False, **fields) -> int:
+    """Connect LED, dispatch a command through the bus, print result."""
     rc = _connect_or_fail()
     if rc:
         return rc
     from trcc.core.app import TrccApp
-    led = TrccApp.get().led_device
-    assert led is not None
-    return _print_result(getattr(led, method)(*args, **kwargs), preview=preview)
+    result = TrccApp.get().led_bus.dispatch(cmd_cls(**fields))
+    return _print_result(result.payload, preview=preview)
 
 
 # =========================================================================
@@ -96,10 +95,8 @@ def set_mode(builder, mode_name, *, preview=False):
     if rc:
         return rc
     from trcc.core.app import TrccApp
-    led = TrccApp.get().led_device
-    assert led is not None
-
-    result = led.set_mode(mode_name)
+    from trcc.core.commands.led import SetLEDModeCommand
+    result = TrccApp.get().led_bus.dispatch(SetLEDModeCommand(mode=mode_name)).payload
     if not result["success"]:
         print(f"Error: {result['error']}")
         if result.get("available"):
@@ -108,19 +105,23 @@ def set_mode(builder, mode_name, *, preview=False):
 
     if result["animated"]:
         from trcc.cli import _ensure_system
+        from trcc.core.commands.led import UpdateMetricsLEDCommand
         from trcc.services import LEDService
         from trcc.services.system import get_all_metrics
 
         _ensure_system(builder)
+        led_bus = TrccApp.get().led_bus
+        led_device = TrccApp.get().led_device
+        assert led_device is not None
         print(f"LED mode: {mode_name} (running, Ctrl+C to stop)")
         _metric_ticks = 0
         try:
             while True:
                 # Refresh sensor metrics every 20 ticks (~1 s)
                 if _metric_ticks % 20 == 0:
-                    led.update_metrics(get_all_metrics())
+                    led_bus.dispatch(UpdateMetricsLEDCommand(metrics=get_all_metrics()))
                 _metric_ticks += 1
-                tick = led.tick_with_result()
+                tick = led_device.tick_with_result()
                 if preview and tick.get("colors"):
                     print(LEDService.zones_to_ansi(tick["colors"]),
                           end='\r', flush=True)
@@ -152,7 +153,8 @@ def set_led_brightness(builder, level, *, preview=False):
 @_cli_handler
 def led_off(builder):
     """Turn LEDs off."""
-    return _led_command(builder, "off")
+    from trcc.core.commands.led import ToggleLEDCommand
+    return _led_dispatch(ToggleLEDCommand, on=False)
 
 
 @_cli_handler
@@ -187,43 +189,50 @@ def set_zone_color(builder, zone: int, hex_color: str, *, preview: bool = False)
 @_cli_handler
 def set_zone_mode(builder, zone: int, mode_name: str, *, preview: bool = False):
     """Set effect mode for a specific LED zone."""
-    return _led_command(builder, "set_zone_mode", zone, mode_name, preview=preview)
+    from trcc.core.commands.led import SetZoneModeCommand
+    return _led_dispatch(SetZoneModeCommand, preview=preview, zone=zone, mode=mode_name)
 
 
 @_cli_handler
 def set_zone_brightness(builder, zone: int, level: int, *, preview: bool = False):
     """Set brightness for a specific LED zone (0-100)."""
-    return _led_command(builder, "set_zone_brightness", zone, level, preview=preview)
+    from trcc.core.commands.led import SetZoneBrightnessCommand
+    return _led_dispatch(SetZoneBrightnessCommand, preview=preview, zone=zone, level=level)
 
 
 @_cli_handler
 def toggle_zone(builder, zone: int, on: bool):
     """Toggle a specific LED zone on/off."""
-    return _led_command(builder, "toggle_zone", zone, on)
+    from trcc.core.commands.led import ToggleZoneCommand
+    return _led_dispatch(ToggleZoneCommand, zone=zone, on=on)
 
 
 @_cli_handler
 def set_zone_sync(builder, enabled: bool, *, interval: int | None = None):
     """Enable/disable zone sync (circulate or select-all depending on style)."""
-    return _led_command(builder, "set_zone_sync", enabled, interval=interval)
+    from trcc.core.commands.led import SetZoneSyncCommand
+    return _led_dispatch(SetZoneSyncCommand, enabled=enabled, interval=interval)
 
 
 @_cli_handler
 def toggle_segment(builder, index: int, on: bool):
     """Toggle a specific LED segment on/off."""
-    return _led_command(builder, "toggle_segment", index, on)
+    from trcc.core.commands.led import ToggleSegmentCommand
+    return _led_dispatch(ToggleSegmentCommand, index=index, on=on)
 
 
 @_cli_handler
 def set_clock_format(builder, is_24h: bool):
     """Set LED segment display clock format (12h/24h)."""
-    return _led_command(builder, "set_clock_format", is_24h)
+    from trcc.core.commands.led import SetClockFormatCommand
+    return _led_dispatch(SetClockFormatCommand, is_24h=is_24h)
 
 
 @_cli_handler
 def set_temp_unit(builder, unit: str):
     """Set LED segment display temperature unit (C/F)."""
-    return _led_command(builder, "set_temp_unit", unit)
+    from trcc.core.commands.led import SetTempUnitLEDCommand
+    return _led_dispatch(SetTempUnitLEDCommand, unit=unit)
 
 
 # =========================================================================

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/_system.py

@@ -33,8 +33,10 @@ def setup_udev(dry_run: bool = False) -> int:
     err = _require_linux("setup-udev")
     if err is not None:
         return err
-    from trcc.adapters.system.linux.setup import setup_udev as _fn
-    return _fn(dry_run=dry_run)
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetupUdevCommand
+    result = TrccApp.get().os_bus.dispatch(SetupUdevCommand(dry_run=dry_run))
+    return 0 if result.success else 1
 
 
 def setup_selinux() -> int:
@@ -42,8 +44,10 @@ def setup_selinux() -> int:
     err = _require_linux("setup-selinux")
     if err is not None:
         return err
-    from trcc.adapters.system.linux.setup import setup_selinux as _fn
-    return _fn()
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetupSelinuxCommand
+    result = TrccApp.get().os_bus.dispatch(SetupSelinuxCommand())
+    return 0 if result.success else 1
 
 
 def setup_polkit() -> int:
@@ -51,8 +55,10 @@ def setup_polkit() -> int:
     err = _require_linux("setup-polkit")
     if err is not None:
         return err
-    from trcc.adapters.system.linux.setup import setup_polkit as _fn
-    return _fn()
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetupPolkitCommand
+    result = TrccApp.get().os_bus.dispatch(SetupPolkitCommand())
+    return 0 if result.success else 1
 
 
 def install_desktop() -> int:
@@ -60,8 +66,10 @@ def install_desktop() -> int:
     err = _require_linux("install-desktop")
     if err is not None:
         return err
-    from trcc.adapters.system.linux.setup import install_desktop as _fn
-    return _fn()
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import InstallDesktopCommand
+    result = TrccApp.get().os_bus.dispatch(InstallDesktopCommand())
+    return 0 if result.success else 1
 
 
 def _sudo_run(cmd):
@@ -133,7 +141,7 @@ def show_info(builder=None, *, preview: bool = False, metric: str | None = None)
 # (see import block above). CLI entry points in __init__.py call them directly.
 
 
-def setup_winusb():
+def setup_winusb() -> int:
     """Guide WinUSB driver installation for Thermalright USB devices (Windows only).
 
     SCSI devices (Frozen Warframe, Elite Vision, etc.) use the default
@@ -146,35 +154,10 @@ def setup_winusb():
         print("This command is for Windows only.")
         print("On Linux, use: trcc setup-udev")
         return 1
-
-    # Detect which devices are connected and need WinUSB
-    from trcc.core.models import BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES
-    winusb_vids = set()
-    for registry in (BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES):
-        for vid, pid in registry:
-            winusb_vids.add((vid, pid))
-
-    print("\n  TRCC WinUSB Driver Setup\n")
-    print("  SCSI devices (Frozen Warframe, Elite Vision, CZTV, etc.)")
-    print("  use the default USB Mass Storage driver — no setup needed.\n")
-    print("  HID, Bulk, and LY devices need the WinUSB driver.")
-    print("  Install it using Zadig (free, open-source):\n")
-    print("  1. Download Zadig: https://zadig.akeo.ie/")
-    print("  2. Run Zadig → Options → List All Devices")
-    print("  3. Select your Thermalright device from the dropdown")
-    print("  4. Set target driver to WinUSB")
-    print("  5. Click 'Replace Driver' (or 'Install Driver')")
-    print("  6. Replug the USB device\n")
-    print("  Devices that need WinUSB:")
-    for vid, pid in sorted(winusb_vids):
-        # Look up friendly name
-        for registry in (BULK_DEVICES, HID_LCD_DEVICES, LED_DEVICES, LY_DEVICES):
-            if (vid, pid) in registry:
-                entry = registry[(vid, pid)]
-                print(f"    {vid:04X}:{pid:04X}  {entry.product}")
-                break
-    print()
-    return 0
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetupWinUsbCommand
+    result = TrccApp.get().os_bus.dispatch(SetupWinUsbCommand())
+    return 0 if result.success else 1
 
 
 # _detect_install_method moved to core/platform.py as detect_install_method()
@@ -228,6 +211,14 @@ def uninstall(*, yes: bool = False):
             os.remove(path_str)
             removed.append(path_str)
 
+    # Disable autostart before shutting down logging — autostart only touches
+    # ~/.config/autostart/, not ~/.trcc/, so order is safe here.
+    from trcc.core.builder import ControllerBuilder
+    autostart = ControllerBuilder.for_current_os().build_autostart()
+    if autostart.is_enabled():
+        autostart.disable()
+        removed.append("autostart entry")
+
     # Shut down logging before deleting ~/.trcc — on Windows the log file
     # handle stays open and blocks rmtree with WinError 32.
     import logging as _logging
@@ -242,13 +233,6 @@ def uninstall(*, yes: bool = False):
                 path.unlink()
             removed.append(str(path))
 
-    # Disable autostart via platform manager
-    from trcc.core.builder import ControllerBuilder
-    autostart = ControllerBuilder.for_current_os().build_autostart()
-    if autostart.is_enabled():
-        autostart.disable()
-        removed.append("autostart entry")
-
     if removed:
         print("Removed:")
         for item in removed:
@@ -313,14 +297,8 @@ def report(detect_fn=None):
 def download_themes(pack=None, show_list=False, force=False, show_info=False):
     """Download theme packs (like spacy download)."""
     try:
-        from trcc.adapters.infra.theme_downloader import download_pack, list_available
-        from trcc.adapters.infra.theme_downloader import show_info as pack_info
-
-        if show_list or pack is None:
-            list_available()
-            return 0
-
-        if show_info:
+        if show_info and pack:
+            from trcc.adapters.infra.theme_downloader import show_info as pack_info
             pack_info(pack)
             return 0
 
@@ -328,7 +306,12 @@ def download_themes(pack=None, show_list=False, force=False, show_info=False):
             from trcc.conf import Settings
             Settings.clear_installed_resolutions()
 
-        return download_pack(pack, force=force)
+        from trcc.core.app import TrccApp
+        from trcc.core.commands.initialize import DownloadThemesCommand
+        dispatch_pack = "" if show_list else (pack or "")
+        result = TrccApp.get().os_bus.dispatch(
+            DownloadThemesCommand(pack=dispatch_pack, force=force))
+        return 0 if result.success else 1
 
     except Exception as e:
         print(f"Error: {e}")
@@ -352,5 +335,7 @@ def _confirm(prompt: str, auto_yes: bool) -> bool:
 
 def run_setup(auto_yes: bool = False) -> int:
     """Interactive setup wizard — dispatches to platform-specific adapter."""
-    from trcc.core.builder import ControllerBuilder
-    return ControllerBuilder.for_current_os().build_setup().run(auto_yes=auto_yes)
+    from trcc.core.app import TrccApp
+    from trcc.core.commands.initialize import SetupPlatformCommand
+    result = TrccApp.get().os_bus.dispatch(SetupPlatformCommand(auto_yes=auto_yes))
+    return 0 if result.success else 1

{trcc_linux-9.2.1 → trcc_linux-9.2.2}/src/trcc/cli/_theme.py

@@ -7,7 +7,6 @@ from trcc.cli import _cli_handler, _device
 @_cli_handler
 def list_themes(cloud=False, category=None):
     """List available themes for the current device resolution."""
-    from trcc.adapters.infra.data_repository import DataManager
     from trcc.conf import settings
     from trcc.services import ThemeService
 
@@ -15,7 +14,6 @@ def list_themes(cloud=False, category=None):
     if not w or not h:
         w, h = 320, 320
 
-    DataManager.ensure_all(w, h)
     settings._resolve_paths()
 
     if cloud:
@@ -46,8 +44,8 @@ def list_themes(cloud=False, category=None):
 @_cli_handler
 def load_theme(builder, name, *, device=None, preview=False):
     """Load a theme by name and send to LCD."""
-    from trcc.adapters.infra.data_repository import DataManager
     from trcc.conf import Settings, settings
+    from trcc.core.commands.lcd import SelectThemeCommand
     from trcc.services import ImageService, ThemeService
 
     svc = _device._get_service(device)
@@ -58,7 +56,6 @@ def load_theme(builder, name, *, device=None, preview=False):
     dev = svc.selected
     w, h = dev.resolution
 
-    DataManager.ensure_all(w, h)
     settings._resolve_paths()
 
     td = settings.theme_dir
@@ -77,11 +74,14 @@ def load_theme(builder, name, *, device=None, preview=False):
         return 1
 
     # Build LCD with full service stack (DisplayService, OverlayService, etc.)
+    from trcc.core.app import TrccApp
     lcd = builder.lcd_from_service(svc)
     lcd.restore_device_settings()
 
-    # Use DisplayService.load_local_theme() — same path as GUI
-    result = lcd._display_svc.load_local_theme(match)
+    # Dispatch SelectThemeCommand through the bus — same path as GUI/API
+    lcd_bus = TrccApp.get().build_lcd_bus(lcd)
+    cmd_result = lcd_bus.dispatch(SelectThemeCommand(theme=match))
+    result = cmd_result.payload
 
     # Save as last-used theme
     key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
@@ -226,7 +226,6 @@ def export_theme(theme_name, output_path):
     """Export a theme as .tr file."""
     from pathlib import Path
 
-    from trcc.adapters.infra.data_repository import DataManager
     from trcc.conf import settings
     from trcc.services import ThemeService
 
@@ -234,7 +233,6 @@ def export_theme(theme_name, output_path):
     if not w or not h:
         w, h = 320, 320
 
-    DataManager.ensure_all(w, h)
     settings._resolve_paths()
 
     td = settings.theme_dir