trcc-linux 3.0.10__tar.gz → 4.1.0__tar.gz

{trcc_linux-3.0.10 → trcc_linux-4.1.0}/.gitignore

@@ -94,6 +94,7 @@ trcc_setup.h
 /src/core.py
 /*.sh
 !install.sh
+!setup.sh
 
 # Dev tooling
 setup_tools/

{trcc_linux-3.0.10 → trcc_linux-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 3.0.10
+Version: 4.1.0
 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-3.0.10 → trcc_linux-4.1.0}/pyproject.toml

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

{trcc_linux-3.0.10 → trcc_linux-4.1.0}/src/trcc/__init__.py

@@ -27,14 +27,14 @@ __version__ = "1.0.0"
 __author__ = "TRCC Linux Contributors"
 
 # Core exports
-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.device_lcd import LCDDriver
+from trcc.adapters.device.detector import detect_devices, get_device_path
+from trcc.adapters.device.lcd import LCDDriver
+from trcc.adapters.infra.dc_config import DcConfig
+from trcc.adapters.infra.dc_parser import dc_to_overlay_config, parse_dc_file
 
 # Animation
-from trcc.media_player import VideoDecoder
-from trcc.system_info import format_metric, get_all_metrics
+from trcc.adapters.infra.media_player import VideoDecoder
+from trcc.adapters.system.info import format_metric, get_all_metrics
 
 __all__ = [
     # Version

{trcc_linux-3.0.10 → trcc_linux-4.1.0}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "3.0.10"
+__version__ = "4.1.0"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -113,3 +113,18 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          Rectangle(x,y,w,h) coordinates, 460×460 widget. Unified device
 #          sidebar buttons: remove DeviceButton class, all buttons use
 #          create_image_button with setChecked() toggle. 2288 tests.
+# 4.0.0  - Hexagonal adapters/ restructure: move 24 flat files into
+#          adapters/device/ (10 files), adapters/system/ (3 files),
+#          adapters/infra/ (11 files). Domain data consolidation: all static
+#          mappings centralized in core/models.py (LED styles, button images,
+#          protocol names, category data). Assets centralization: eliminate
+#          19 duplicate .png calls via Assets class. Language state unified:
+#          settings.lang singleton replaces 5 widget self._lang copies.
+#          Clean hexagonal boundary: core/ + services/ (pure Python) →
+#          adapters/ (device/system/infra I/O). 2290 tests.
+# 4.1.0  - Setup wizard: CLI (trcc setup) interactive step-by-step + GUI
+#          (trcc setup-gui) PySide6 wizard with check panel, Install buttons,
+#          terminal output streaming. Bootstrap script (setup.sh) auto-detects
+#          GUI/CLI. Expanded distro support (Solus, Clear Linux, SteamOS, Artix,
+#          PostmarketOS). PM provides fallback for unmapped deps. Uninstall
+#          --yes flag for non-interactive use. 2290 tests.

trcc_linux-4.1.0/src/trcc/adapters/__init__.py

@@ -0,0 +1 @@
+"""TRCC Adapters — device protocols, system integration, infrastructure."""

trcc_linux-4.1.0/src/trcc/adapters/device/__init__.py

@@ -0,0 +1 @@
+"""Device protocol adapters — SCSI, HID, LED, Bulk."""

trcc_linux-3.0.10/src/trcc/device_bulk.py → trcc_linux-4.1.0/src/trcc/adapters/device/bulk.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 import logging
 import struct
 
-from .core.models import HandshakeResult, fbl_to_resolution, pm_to_fbl
+from trcc.core.models import HandshakeResult, fbl_to_resolution, pm_to_fbl
 
 log = logging.getLogger(__name__)
 
@@ -99,10 +99,31 @@ class BulkDevice:
                 if dev.is_kernel_driver_active(i):  # type: ignore[union-attr]
                     dev.detach_kernel_driver(i)  # type: ignore[union-attr]
                     log.debug("Detached kernel driver from interface %d", i)
-            except (usb.core.USBError, NotImplementedError):
-                pass
+            except (usb.core.USBError, NotImplementedError) as e:
+                log.debug("Could not detach kernel driver from interface %d: %s", i, e)
 
-        dev.set_configuration()  # type: ignore[union-attr]
+        try:
+            dev.set_configuration()  # type: ignore[union-attr]
+        except usb.core.USBError:
+            # SELinux or other security modules may block detach_kernel_driver
+            # silently.  Reset the device to force-release all drivers, then retry.
+            log.warning("set_configuration() failed, resetting device and retrying")
+            dev.reset()  # type: ignore[union-attr]
+            import time
+            time.sleep(0.5)
+            # Re-find after reset (handle is invalidated)
+            dev = usb.core.find(idVendor=self.vid, idProduct=self.pid)
+            if dev is None:
+                raise RuntimeError(
+                    f"USB device {self.vid:04x}:{self.pid:04x} not found after reset"
+                )
+            for i in range(4):
+                try:
+                    if dev.is_kernel_driver_active(i):  # type: ignore[union-attr]
+                        dev.detach_kernel_driver(i)  # type: ignore[union-attr]
+                except (usb.core.USBError, NotImplementedError):
+                    pass
+            dev.set_configuration()  # type: ignore[union-attr]
         cfg = dev.get_active_configuration()  # type: ignore[union-attr]
 
         # Prefer vendor-specific interface (bInterfaceClass=255)

trcc_linux-3.0.10/src/trcc/device_detector.py → trcc_linux-4.1.0/src/trcc/adapters/device/detector.py

@@ -27,7 +27,7 @@ import subprocess
 from dataclasses import dataclass
 from typing import List, Optional
 
-from .data_repository import SysUtils
+from trcc.adapters.infra.data_repository import SysUtils
 
 log = logging.getLogger(__name__)
 

trcc_linux-3.0.10/src/trcc/device_factory.py → trcc_linux-4.1.0/src/trcc/adapters/device/factory.py

@@ -23,7 +23,12 @@ from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
-from .core.models import HandshakeResult
+from trcc.core.models import (
+    DEVICE_TYPE_NAMES,
+    LED_DEVICE_TYPE_NAME,
+    PROTOCOL_NAMES,
+    HandshakeResult,
+)
 
 log = logging.getLogger(__name__)
 
@@ -143,7 +148,7 @@ class ScsiProtocol(DeviceProtocol):
 
     def send_image(self, image_data: bytes, width: int, height: int) -> bool:
         try:
-            from .device_scsi import send_image_to_device
+            from .scsi import send_image_to_device
             log.debug("SCSI send: %d bytes to %s (%dx%d)", len(image_data), self._path, width, height)
             success = send_image_to_device(self._path, image_data, width, height)
             self._notify_send_complete(success)
@@ -214,7 +219,7 @@ class HidProtocol(DeviceProtocol):
                 self._transport.open()
                 self._notify_state_changed("transport_open", True)
 
-            from .device_hid import HidDeviceType2, HidDeviceType3
+            from .hid import HidDeviceType2, HidDeviceType3
             if self._device_type == 2:
                 handler = HidDeviceType2(self._transport)
             elif self._device_type == 3:
@@ -246,7 +251,7 @@ class HidProtocol(DeviceProtocol):
 
     def send_image(self, image_data: bytes, width: int, height: int) -> bool:
         try:
-            from .device_hid import HidDeviceManager
+            from .hid import HidDeviceManager
             if self._transport is None:
                 self._transport = self._create_transport()
                 self._transport.open()
@@ -361,10 +366,10 @@ class LedProtocol(DeviceProtocol):
                 self._notify_state_changed("transport_open", True)
 
             if self._sender is None:
-                from .device_led import LedHidSender
+                from .led import LedHidSender
                 self._sender = LedHidSender(self._transport)
 
-            from .device_led import LedPacketBuilder, remap_led_colors
+            from .led import LedPacketBuilder, remap_led_colors
 
             # Remap logical LED order → physical wire order (per-style).
             if self._handshake_info and self._handshake_info.style:
@@ -403,7 +408,7 @@ class LedProtocol(DeviceProtocol):
                 self._notify_state_changed("transport_open", True)
 
             if self._sender is None:
-                from .device_led import LedHidSender
+                from .led import LedHidSender
                 self._sender = LedHidSender(self._transport)
 
             self._handshake_info = self._sender.handshake()
@@ -499,7 +504,7 @@ class BulkProtocol(DeviceProtocol):
     def _ensure_device(self):
         """Lazily create and handshake the bulk device."""
         if self._device is None:
-            from .device_bulk import BulkDevice
+            from .bulk import BulkDevice
             self._device = BulkDevice(self._vid, self._pid)
             result = self._device.handshake()
             self._handshake_result = result
@@ -702,12 +707,12 @@ class DeviceProtocolFactory:
     @staticmethod
     def create_usb_transport(vid: int, pid: int):
         """Create the best available USB transport (pyusb preferred, hidapi fallback)."""
-        from .device_hid import HIDAPI_AVAILABLE, PYUSB_AVAILABLE
+        from .hid import HIDAPI_AVAILABLE, PYUSB_AVAILABLE
         if PYUSB_AVAILABLE:
-            from .device_hid import PyUsbTransport
+            from .hid import PyUsbTransport
             return PyUsbTransport(vid, pid)
         elif HIDAPI_AVAILABLE:
-            from .device_hid import HidApiTransport
+            from .hid import HidApiTransport
             return HidApiTransport(vid, pid)
         else:
             raise ImportError(
@@ -720,7 +725,7 @@ class DeviceProtocolFactory:
     def _get_hid_backends() -> Dict[str, bool]:
         """Check HID backend availability."""
         try:
-            from .device_hid import HIDAPI_AVAILABLE, PYUSB_AVAILABLE
+            from .hid import HIDAPI_AVAILABLE, PYUSB_AVAILABLE
             return {"pyusb": PYUSB_AVAILABLE, "hidapi": HIDAPI_AVAILABLE}
         except ImportError:
             return {"pyusb": False, "hidapi": False}
@@ -816,21 +821,8 @@ class DeviceProtocolFactory:
 # Protocol Info API — for GUI to query device/backend state
 # =========================================================================
 
-PROTOCOL_NAMES = {
-    "scsi": "SCSI (sg_raw)",
-    "hid": "HID (USB bulk)",
-    "led": "LED (HID 64-byte)",
-    "bulk": "USB Bulk (USBLCDNew)",
-}
-
-DEVICE_TYPE_NAMES = {
-    1: "SCSI RGB565",
-    2: "HID Type 2 (H)",
-    3: "HID Type 3 (ALi)",
-    4: "Raw USB Bulk LCD",
-}
-
-LED_DEVICE_TYPE_NAME = "RGB LED Controller"
+# Domain data re-exported from core.models (canonical location):
+# PROTOCOL_NAMES, DEVICE_TYPE_NAMES, LED_DEVICE_TYPE_NAME
 
 
 @dataclass

trcc_linux-3.0.10/src/trcc/device_hid.py → trcc_linux-4.1.0/src/trcc/adapters/device/hid.py

@@ -22,15 +22,18 @@ import logging
 import struct
 import time
 from abc import ABC, abstractmethod
-from dataclasses import dataclass
 from typing import Any, Optional, Set
 
 import usb.core
 import usb.util
 
-from .core.models import (
-    HandshakeResult,
+from trcc.core.models import (
+    DEVICE_BUTTON_IMAGE,  # noqa: F401 — re-export
+    PM_TO_BUTTON_IMAGE,  # noqa: F401 — re-export
+    HandshakeResult,  # noqa: F401 — re-export
+    HidHandshakeInfo,
     fbl_to_resolution,
+    get_button_image,  # noqa: F401 — re-export
     pm_to_fbl,
 )
 
@@ -106,80 +109,8 @@ USB_INTERFACE = 0
 
 
 
-# _PM_TO_FBL_OVERRIDES, fbl_to_resolution, pm_to_fbl imported from core.models
-
-# Unified device → button image map (from UCDevice.cs ADDUserButton).
-# Outer key: HID PM byte (0-255) or SCSI VID (>255).
-# Inner key: HID SUB byte or SCSI PID.  None = default when sub/pid not matched.
-DEVICE_BUTTON_IMAGE: dict[int, dict[Optional[int], str]] = {
-    # -- HID Vision/RGB devices (case 257, PM + SUB) --
-    1:   {0: 'A1GRAND VISION', 1: 'A1GRAND VISION',
-          48: 'A1LM22', 49: 'A1LF14', None: 'A1GRAND VISION'},
-    3:   {None: 'A1CORE VISION'},
-    4:   {1: 'A1HYPER VISION', 2: 'A1RP130 VISION', 3: 'A1LM16SE'},
-    5:   {None: 'A1Mjolnir VISION'},
-    6:   {1: 'FROZEN WARFRAME Ultra', 2: 'A1FROZEN VISION V2'},
-    7:   {1: 'A1Stream Vision', 2: 'A1Mjolnir VISION PRO'},
-    9:   {None: 'A1LC2JD'},
-    10:  {5: 'A1LF16', 6: 'A1LF18', None: 'A1LC3'},
-    11:  {None: 'A1LF19'},
-    12:  {None: 'A1LF167'},
-    # -- HID LCD devices (case 2 + case 257 merged, PM + SUB) --
-    32:  {0: 'A1ELITE VISION', 1: 'A1FROZEN WARFRAME PRO',
-          None: 'A1ELITE VISION'},
-    36:  {None: 'A1AS120 VISION'},
-    50:  {None: 'A1FROZEN WARFRAME'},
-    51:  {None: 'A1FROZEN WARFRAME'},
-    52:  {None: 'A1BA120 VISION'},
-    53:  {None: 'A1BA120 VISION'},
-    54:  {None: 'A1LC5'},
-    58:  {0: 'A1FROZEN WARFRAME SE', None: 'A1LM26'},
-    64:  {0: 'A1FROZEN WARFRAME PRO', 1: 'A1LM22', 2: 'A1LM27'},
-    65:  {0: 'A1ELITE VISION', 1: 'A1LF14'},
-    100: {0: 'A1FROZEN WARFRAME PRO', 1: 'A1LM22',
-          None: 'A1FROZEN WARFRAME PRO'},
-    101: {0: 'A1ELITE VISION', 1: 'A1LF14', None: 'A1ELITE VISION'},
-    128: {None: 'A1LM24'},
-    # -- SCSI devices (VID → {PID: image}) --
-    0x87CD: {0x70DB: 'A1CZTV', None: 'A1CZTV'},
-    0x87AD: {0x70DB: 'A1GRAND VISION', None: 'A1GRAND VISION'},
-    0x0402: {0x3922: 'A1FROZEN WARFRAME', None: 'A1FROZEN WARFRAME'},
-    0x0416: {0x5406: 'A1CZTV', None: 'A1CZTV'},
-}
-
-# Keep old name as alias for backward compat
-PM_TO_BUTTON_IMAGE = DEVICE_BUTTON_IMAGE
-
-
-def get_button_image(key: int, sub: int = 0) -> Optional[str]:
-    """Resolve device button image from PM+SUB (HID) or VID+PID (SCSI).
-
-    Args:
-        key: PM byte (0-255) for HID devices, or VID for SCSI devices.
-        sub: SUB byte for HID devices, or PID for SCSI devices.
-
-    Returns image name, or None if unknown.
-    """
-    sub_map = DEVICE_BUTTON_IMAGE.get(key)
-    if sub_map is None:
-        return None
-    if sub in sub_map:
-        return sub_map[sub]
-    return sub_map.get(None)
-
-
-# =========================================================================
-# Data classes
-# =========================================================================
-
-@dataclass
-class HidHandshakeInfo(HandshakeResult):
-    """HID-specific handshake info (extends HandshakeResult)."""
-    device_type: int = 0      # 2 or 3
-    mode_byte_1: int = 0     # Type 2: resp[5] (PM), Type 3: resp[0]-1
-    mode_byte_2: int = 0     # Type 2: resp[4] (SUB), Type 3: 0
-    fbl: Optional[int] = None  # FBL code resolved from PM/SUB
-
+# Domain data re-exported from core.models (canonical location):
+# DEVICE_BUTTON_IMAGE, PM_TO_BUTTON_IMAGE, get_button_image, HidHandshakeInfo
 
 # =========================================================================
 # Abstract USB transport

trcc_linux-3.0.10/src/trcc/device_lcd.py → trcc_linux-4.1.0/src/trcc/adapters/device/lcd.py

@@ -7,11 +7,12 @@ Combines device detection with implementation-specific protocols.
 import logging
 from typing import Optional
 
-from .core.models import LCDDeviceConfig
-from .device_detector import DetectedDevice, detect_devices, get_default_device
-from .device_scsi import ScsiDevice
-from .services.device import DeviceService
-from .services.image import ImageService
+from trcc.core.models import LCDDeviceConfig
+from trcc.services.device import DeviceService
+from trcc.services.image import ImageService
+
+from .detector import DetectedDevice, detect_devices, get_default_device
+from .scsi import ScsiDevice
 
 log = logging.getLogger(__name__)