trcc-linux 9.7.2__tar.gz → 9.7.3__tar.gz

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/PKG-INFO

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

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

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/__version__.py

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

trcc_linux-9.7.3/src/trcc/adapters/device/_pyusb_find.py

@@ -0,0 +1,43 @@
+"""PyUSB ``find()`` seam — uses libusb_package's bundled backend on Windows.
+
+PyUSB needs ``libusb-1.0`` userspace to talk to USB devices.  Linux/macOS/BSD
+ship it via the system package manager; **Windows has no system libusb**, so
+pip-installed *and* PyInstaller-frozen users hit
+``usb.core.NoBackendError: No backend available`` (#131, and again #187/#188 once
+the GUI launch crash was fixed and discovery actually ran).
+
+The canonical fix is `libusb-package <https://github.com/pyocd/libusb-package>`_
+(pyocd's project): a Windows wheel that bundles ``libusb-1.0.dll`` and exposes a
+``find()`` that loads that bundled DLL **explicitly by path** — not via the
+flaky ``ctypes``/PATH search that bare ``usb.core.find`` relies on.  It's a
+Windows-only dependency in ``pyproject.toml``.
+
+This module is the ONE seam every ``usb.core.find`` call goes through, so there
+is exactly one place that knows about the Windows backend quirk (the cutover
+dropped this seam and reverted every call site to bare ``usb.core.find``, which
+is what reintroduced the crash).  Importing ``libusb_package`` here is also what
+makes PyInstaller bundle the module + its DLL into the frozen Windows build.
+"""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+log = logging.getLogger(__name__)
+
+try:
+    from libusb_package import find as _find  # pyright: ignore[reportMissingImports]
+    log.debug("pyusb backend: libusb-package (bundled libusb-1.0)")
+except ImportError:
+    from usb.core import find as _find
+    log.debug("pyusb backend: system libusb via usb.core.find")
+
+
+def find(*args: Any, **kwargs: Any) -> Any:
+    """Drop-in for ``usb.core.find()`` with a Windows-compatible backend.
+
+    Identical signature + return type.  Routes through ``libusb_package.find``
+    where it's installed (Windows, via the bundled DLL) and falls back to
+    ``usb.core.find`` everywhere else (Linux/macOS/BSD system libusb).
+    """
+    return _find(*args, **kwargs)

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/device/transport.py

@@ -19,6 +19,7 @@ import usb.util
 
 from ...core.errors import PermissionError_, TransportError
 from ...core.ports import BulkTransport
+from ._pyusb_find import find as usb_find
 
 # Optional hidapi backend (the [hid] extra)
 try:
@@ -79,7 +80,7 @@ class PyUsbBulkTransport(BulkTransport):
         if self._serial:
             kwargs['serial_number'] = self._serial
 
-        self._device = usb.core.find(**kwargs)
+        self._device = usb_find(**kwargs)
         if self._device is None:
             log.error("USB device %04X:%04X not found", self._vid, self._pid)
             return False
@@ -203,7 +204,7 @@ class PyUsbBulkTransport(BulkTransport):
         }
         if self._serial:
             kwargs['serial_number'] = self._serial
-        new_device = usb.core.find(**kwargs)
+        new_device = usb_find(**kwargs)
         if new_device is None:
             raise TransportError(
                 f"USB device {self._vid:04X}:{self._pid:04X} disappeared "

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/system/_winusb.py

@@ -123,13 +123,13 @@ def _classify_devices() -> tuple[
     driver.  We can't tell the two apart without enumerating Windows'
     own driver tree, so the instructions cover both cases.
     """
-    import usb.core
+    from ..device._pyusb_find import find as usb_find
 
     visible: list[tuple[int, int, str]] = []
     invisible: list[tuple[int, int, str]] = []
     for (vid, pid), product in sorted(ALL_DEVICES.items()):
         label = f"{product.vendor} {product.product}"
-        if any(usb.core.find(find_all=True, idVendor=vid, idProduct=pid) or []):
+        if any(usb_find(find_all=True, idVendor=vid, idProduct=pid) or []):
             visible.append((vid, pid, label))
         else:
             invisible.append((vid, pid, label))

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/system/bsd.py

@@ -14,7 +14,6 @@ from collections.abc import Callable
 from pathlib import Path
 
 import psutil  # pyright: ignore[reportMissingImports]
-import usb.core
 import usb.util
 
 from ...core.models import DeviceInfo
@@ -28,6 +27,7 @@ from ...core.ports import (
     SensorEnumerator,
 )
 from ...core.registry import ALL_DEVICES
+from ..device._pyusb_find import find as usb_find
 from ..device.transport import PyUsbBulkTransport
 from ..device.usb_bot_scsi import UsbBotScsiTransport
 from . import PlatformFactory
@@ -89,7 +89,7 @@ class BSDPlatform(Platform):
                  len(ALL_DEVICES))
         found: list[DeviceInfo] = []
         for (vid, pid) in ALL_DEVICES:
-            for dev in (usb.core.find(find_all=True, idVendor=vid, idProduct=pid) or []):
+            for dev in (usb_find(find_all=True, idVendor=vid, idProduct=pid) or []):
                 serial_idx = getattr(dev, "iSerialNumber", 0)
                 serial = ""
                 try:

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/system/linux.py

@@ -17,7 +17,6 @@ import logging
 import os
 from pathlib import Path
 
-import usb.core
 import usb.util
 
 from ...core.errors import TransportError
@@ -32,6 +31,7 @@ from ...core.ports import (
     SensorEnumerator,
 )
 from ...core.registry import ALL_DEVICES
+from ..device._pyusb_find import find as usb_find
 from ..device.transport import PyUsbBulkTransport
 from ..sensors.aggregator import build_linux_sensors
 from ..sensors.gpu_detect import (
@@ -459,7 +459,7 @@ class LinuxPlatform(Platform):
                  len(ALL_DEVICES))
         found: list[DeviceInfo] = []
         for (vid, pid) in ALL_DEVICES:
-            for dev in (usb.core.find(find_all=True, idVendor=vid, idProduct=pid) or []):
+            for dev in (usb_find(find_all=True, idVendor=vid, idProduct=pid) or []):
                 serial_idx = getattr(dev, 'iSerialNumber', 0)
                 serial: str = ""
                 try:

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/system/macos.py

@@ -17,7 +17,6 @@ from collections.abc import Callable
 from pathlib import Path
 
 import psutil  # pyright: ignore[reportMissingImports]
-import usb.core
 import usb.util
 
 from ...core.models import DeviceInfo
@@ -31,6 +30,7 @@ from ...core.ports import (
     SensorEnumerator,
 )
 from ...core.registry import ALL_DEVICES
+from ..device._pyusb_find import find as usb_find
 from ..device.transport import PyUsbBulkTransport
 from ..device.usb_bot_scsi import UsbBotScsiTransport
 from . import PlatformFactory
@@ -93,7 +93,7 @@ class MacOSPlatform(Platform):
                  len(ALL_DEVICES))
         found: list[DeviceInfo] = []
         for (vid, pid) in ALL_DEVICES:
-            for dev in (usb.core.find(find_all=True, idVendor=vid, idProduct=pid) or []):
+            for dev in (usb_find(find_all=True, idVendor=vid, idProduct=pid) or []):
                 serial_idx = getattr(dev, "iSerialNumber", 0)
                 serial = ""
                 try:

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/adapters/system/windows.py

@@ -17,7 +17,6 @@ from contextlib import AbstractContextManager
 from pathlib import Path
 from typing import Any
 
-import usb.core
 import usb.util
 
 from ...core.errors import TransportError
@@ -32,6 +31,7 @@ from ...core.ports import (
     SensorEnumerator,
 )
 from ...core.registry import ALL_DEVICES
+from ..device._pyusb_find import find as usb_find
 from ..device.transport import PyUsbBulkTransport
 from ..sensors.windows import build_windows_sensors
 from . import PlatformFactory
@@ -359,7 +359,7 @@ class WindowsPlatform(Platform):
                  len(ALL_DEVICES))
         found: list[DeviceInfo] = []
         for (vid, pid) in ALL_DEVICES:
-            for dev in (usb.core.find(find_all=True, idVendor=vid, idProduct=pid) or []):
+            for dev in (usb_find(find_all=True, idVendor=vid, idProduct=pid) or []):
                 serial_idx = getattr(dev, "iSerialNumber", 0)
                 serial = ""
                 try:

{trcc_linux-9.7.2 → trcc_linux-9.7.3}/src/trcc/ipc.py

@@ -342,7 +342,13 @@ class IPCServer:
         """Bind + listen.  Caller is responsible for serving (see ``serve_forever``)."""
         log.info("start: called")
         if not hasattr(socket, "AF_UNIX"):
-            raise RuntimeError("AF_UNIX not available — daemon mode requires Unix")
+            # Windows has no AF_UNIX — the GUI/daemon simply runs in-process,
+            # hosting no socket.  Legacy degraded here; the cutover changed this
+            # to `raise`, which crashed the Windows GUI on launch (#187 follow-on,
+            # surfaced once the libusb fix let the GUI boot far enough to reach it).
+            log.info("start: AF_UNIX unavailable (Windows) — IPC server skipped; "
+                     "running in-process")
+            return
         path = socket_path()
         path.parent.mkdir(parents=True, exist_ok=True)
         if path.exists():

trcc_linux-9.7.3/tests/test_ipc_windows_fallback.py

@@ -0,0 +1,24 @@
+"""IPCServer.start() must degrade gracefully without AF_UNIX (Windows).
+
+Legacy returned here ("IPC server skipped -- AF_UNIX not available"); the cutover
+changed it to ``raise RuntimeError``, which crashed the Windows GUI on launch —
+``run_gui`` calls ``ipc_server.start()`` unconditionally, and that surfaced once
+the libusb fix let the GUI boot far enough to reach IPC setup (#187 follow-on).
+The GUI hosts no socket on Windows; it just runs in-process.
+"""
+from __future__ import annotations
+
+import pytest
+
+import trcc.ipc as ipc_mod
+
+
+def test_start_skips_without_af_unix(monkeypatch: pytest.MonkeyPatch) -> None:
+    # Simulate Windows: no socket.AF_UNIX.
+    monkeypatch.delattr(ipc_mod.socket, "AF_UNIX", raising=False)
+
+    server = ipc_mod.IPCServer(app=object())  # type: ignore[arg-type]
+    server.start()              # must NOT raise — the Windows GUI relies on this
+    assert server._sock is None  # nothing bound
+
+    server.shutdown()           # safe even though start() never bound a socket

trcc_linux-9.7.3/tests/test_pyusb_find_seam.py

@@ -0,0 +1,38 @@
+"""Every USB scan must go through the libusb-backend seam (#187/#188, #131).
+
+The cutover reverted every call site to bare ``usb.core.find``, which on Windows
+(no system libusb) raises ``usb.core.NoBackendError``.  ``_pyusb_find.find``
+routes through ``libusb_package``'s bundled DLL there.  This guards that no
+production module reintroduces a direct ``usb.core.find`` call, and that the seam
+itself is importable + callable on this box.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+
+from trcc.adapters.device._pyusb_find import find
+
+_SRC = Path(__file__).resolve().parent.parent / "src" / "trcc"
+_SEAM = _SRC / "adapters" / "device" / "_pyusb_find.py"
+
+
+def test_no_direct_usb_core_find_outside_the_seam() -> None:
+    """Only ``_pyusb_find`` may name the raw backend; everyone else uses it."""
+    offenders: list[str] = []
+    for py in _SRC.rglob("*.py"):
+        if py == _SEAM:
+            continue
+        text = py.read_text(encoding="utf-8")
+        if "usb.core.find(" in text:
+            offenders.append(str(py.relative_to(_SRC)))
+    assert not offenders, (
+        "direct usb.core.find() calls bypass the libusb-backend seam — "
+        f"route them through adapters.device._pyusb_find.find: {offenders}"
+    )
+
+
+def test_seam_is_callable_without_backend_error() -> None:
+    """find() resolves a backend on this box (system libusb) — a bogus VID/PID
+    yields no devices, but must NOT raise NoBackendError."""
+    result = find(find_all=True, idVendor=0xFFFF, idProduct=0xFFFF)
+    assert list(result or []) == []