trcc-linux 1.2.1__tar.gz → 1.2.3__tar.gz

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "1.2.1"
+version = "1.2.3"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -104,6 +104,11 @@ python_files = ["test_*.py"]
 python_classes = ["Test*"]
 python_functions = ["test_*"]
 addopts = "-v --tb=short"
+# pyusb 1.3.1 uses _pack_ in ctypes — deprecated in Python 3.14 (pyusb#535)
+# Remove once pyusb releases a fix with _layout_ = 'ms'
+filterwarnings = [
+    "ignore::DeprecationWarning:usb",
+]
 
 [tool.ruff]
 line-length = 100

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -17,3 +17,7 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #         ruff linting, protocol reverse engineering docs, 1836 tests
 # 1.2.1 - Fix RGB565 byte order for non-320x320 SCSI devices, fix GUI crash on
 #         HID handshake failure, add verbose debug logging (trcc -vv gui)
+# 1.2.2 - Fix local themes not loading from pip install (Custom_ dirs blocked
+#         on-demand download), bump for PyPI
+# 1.2.3 - Refactor: print→logging across 12 modules, thread-safe device send,
+#         extract _setup_theme_dirs helper, pyusb deprecation warning filter

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/cloud_downloader.py

@@ -33,12 +33,15 @@ Usage:
     results = downloader.download_category("a", max_themes=20)
 """
 
+import logging
 import threading
 from pathlib import Path
 from typing import Callable, Dict, List, Optional
 from urllib.error import HTTPError, URLError
 from urllib.request import Request, urlopen
 
+log = logging.getLogger(__name__)
+
 # Category definitions matching Windows FormCZTV.CheakWebFile
 # (prefix, display_name, count)
 # Counts updated to match actual server/preview availability
@@ -282,7 +285,7 @@ class CloudThemeDownloader:
         try:
             return self._download_file(url, dest_path, on_progress)
         except Exception as e:
-            print(f"[!] Failed to download {theme_id}: {e}")
+            log.error("Failed to download %s: %s", theme_id, e)
             return None
 
     def download_preview(
@@ -421,21 +424,21 @@ class CloudThemeDownloader:
 
         except HTTPError as e:
             if e.code == 404:
-                print(f"[!] Theme not found: {url}")
+                log.warning("Theme not found: %s", url)
             else:
-                print(f"[!] HTTP Error {e.code}: {url}")
+                log.error("HTTP %d: %s", e.code, url)
             return None
 
         except URLError as e:
-            print(f"[!] Network Error: {e.reason}")
+            log.error("Network error: %s", e.reason)
             return None
 
         except InterruptedError:
-            print("[!] Download cancelled")
+            log.info("Download cancelled")
             return None
 
         except Exception as e:
-            print(f"[!] Download error: {e}")
+            log.error("Download error: %s", e)
             return None
 
     def get_all_theme_ids(self) -> List[str]:

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/core/controllers.py

@@ -544,6 +544,21 @@ class LCDDeviceController:
         # Wire up sub-controller callbacks
         self._setup_callbacks()
 
+    def _setup_theme_dirs(self, width: int, height: int):
+        """Extract, locate, and wire theme/web/mask directories for a resolution."""
+        ensure_themes_extracted(width, height)
+        ensure_web_extracted(width, height)
+        ensure_web_masks_extracted(width, height)
+
+        theme_dir = Path(get_theme_dir(width, height))
+        web_dir = Path(get_web_dir(width, height))
+        masks_dir = Path(get_web_masks_dir(width, height))
+        self.themes.set_directories(
+            local_dir=theme_dir if theme_dir.exists() else None,
+            web_dir=web_dir if web_dir.exists() else None,
+            masks_dir=masks_dir,
+        )
+
     def _setup_callbacks(self):
         """Wire up sub-controller callbacks."""
         # Theme selection -> load and preview
@@ -591,22 +606,7 @@ class LCDDeviceController:
         # Extract all .7z archives for this resolution if needed
         # Skip for LED-only devices (no LCD, resolution is 0×0)
         if self.lcd_width and self.lcd_height:
-            ensure_themes_extracted(self.lcd_width, self.lcd_height)
-            ensure_web_extracted(self.lcd_width, self.lcd_height)
-            ensure_web_masks_extracted(self.lcd_width, self.lcd_height)
-
-            # Set theme directories (use get_theme_dir which checks both pkg and user dirs)
-            theme_dir = Path(get_theme_dir(self.lcd_width, self.lcd_height))
-            web_dir = Path(get_web_dir(self.lcd_width, self.lcd_height))
-            masks_dir = Path(get_web_masks_dir(self.lcd_width, self.lcd_height))
-
-            self.themes.set_directories(
-                local_dir=theme_dir if theme_dir.exists() else None,
-                web_dir=web_dir if web_dir.exists() else None,
-                masks_dir=masks_dir,
-            )
-
-            # Load initial themes
+            self._setup_theme_dirs(self.lcd_width, self.lcd_height)
             self.themes.load_local_themes((self.lcd_width, self.lcd_height))
 
         # Detect devices
@@ -628,19 +628,7 @@ class LCDDeviceController:
         # Extract all .7z archives for this resolution if needed
         # Skip for LED-only devices (no LCD, resolution is 0×0)
         if width and height:
-            ensure_themes_extracted(width, height)
-            ensure_web_extracted(width, height)
-            ensure_web_masks_extracted(width, height)
-
-            # Reload theme directories for new resolution
-            theme_dir = Path(get_theme_dir(width, height))
-            web_dir = Path(get_web_dir(width, height))
-            masks_dir = Path(get_web_masks_dir(width, height))
-            self.themes.set_directories(
-                local_dir=theme_dir if theme_dir.exists() else None,
-                web_dir=web_dir if web_dir.exists() else None,
-                masks_dir=masks_dir,
-            )
+            self._setup_theme_dirs(width, height)
             self.themes.load_local_themes((width, height))
 
         if self.on_resolution_changed:
@@ -912,7 +900,7 @@ class LCDDeviceController:
             mask_position = self._parse_mask_position(dc_path, mask_img)
             self.overlay.set_theme_mask(mask_img, mask_position)
         except Exception as e:
-            print(f"[!] Failed to load mask: {e}")
+            log.error("Failed to load mask: %s", e)
 
     def load_image_file(self, path: Path):
         """Load a static image file (from settings panel 'Load Image')."""
@@ -1180,7 +1168,7 @@ class LCDDeviceController:
                     self.overlay.model.set_dc_data({'display_options': display_options})
                     return display_options
             except Exception as e:
-                print(f"[!] Failed to load config.json, falling back to DC: {e}")
+                log.warning("Failed to load config.json, falling back to DC: %s", e)
 
         # Fall back to binary config1.dc
         if not dc_path or not dc_path.exists():
@@ -1195,7 +1183,7 @@ class LCDDeviceController:
             self.overlay.model.set_dc_data(dc_data)
             return dc_data.get('display_options', {})
         except Exception as e:
-            print(f"[!] Failed to parse DC file: {e}")
+            log.error("Failed to parse DC file: %s", e)
             return {}
 
     def _render_and_send(self):
@@ -1232,7 +1220,7 @@ class LCDDeviceController:
 
     def _handle_error(self, message: str):
         """Handle error."""
-        print(f"[!] {message}")
+        log.error("%s", message)
         if self.on_error:
             self.on_error(message)
 
@@ -1385,8 +1373,8 @@ class LEDController:
                 )
                 if self.on_send_complete:
                     self.on_send_complete(success)
-            except Exception:
-                pass
+            except Exception as e:
+                log.debug("LED send error: %s", e)
 
     def _on_model_state_changed(self, state) -> None:
         """Forward model state changes to view."""
@@ -1493,7 +1481,7 @@ class LEDDeviceController:
             config['is_week_sunday'] = state.is_week_sunday
             save_device_setting(self._device_key, 'led_config', config)
         except Exception as e:
-            print(f"[!] Failed to save LED config: {e}")
+            log.error("Failed to save LED config: %s", e)
 
     def load_config(self) -> None:
         """Restore LED state from per-device config."""
@@ -1536,7 +1524,7 @@ class LEDDeviceController:
             if 'is_week_sunday' in led_config:
                 state.is_week_sunday = led_config['is_week_sunday']
         except Exception as e:
-            print(f"[!] Failed to load LED config: {e}")
+            log.error("Failed to load LED config: %s", e)
 
     def cleanup(self) -> None:
         """Save config and release resources."""

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/core/models.py

@@ -5,6 +5,7 @@ These models can be used by any GUI framework (Tkinter, PyQt6, etc.)
 """
 
 import logging
+import threading
 from dataclasses import dataclass, field
 from enum import Enum, auto
 from pathlib import Path
@@ -269,8 +270,9 @@ class DeviceModel:
     on_selection_changed: Optional[Callable[[Optional[DeviceInfo]], None]] = None
     on_send_complete: Optional[Callable[[bool], None]] = None
 
-    # Send state
+    # Send state (guarded by _send_lock for thread safety)
     _send_busy: bool = False
+    _send_lock: threading.Lock = field(default_factory=threading.Lock)
 
     def detect_devices(self) -> List[DeviceInfo]:
         """Detect connected LCD devices."""
@@ -336,32 +338,34 @@ class DeviceModel:
         Returns:
             True if send was successful.
         """
-        if not self.selected_device or self._send_busy:
-            return False
+        with self._send_lock:
+            if self._send_busy:
+                return False
+            self._send_busy = True
 
         try:
             from ..device_factory import DeviceProtocolFactory
-            self._send_busy = True
 
             protocol = DeviceProtocolFactory.get_protocol(self.selected_device)
             success = protocol.send_image(image_data, width, height)
 
-            self._send_busy = False
-
             if self.on_send_complete:
                 self.on_send_complete(success)
 
             return success
 
         except Exception as e:
-            self._send_busy = False
-            print(f"[!] Device send error: {e}")
+            log.error("Device send error: %s", e)
             return False
+        finally:
+            with self._send_lock:
+                self._send_busy = False
 
     @property
     def is_busy(self) -> bool:
         """Check if device is busy sending."""
-        return self._send_busy
+        with self._send_lock:
+            return self._send_busy
 
 
 # =============================================================================
@@ -477,7 +481,7 @@ class VideoModel:
             return True
 
         except Exception as e:
-            print(f"[!] Failed to load video: {e}")
+            log.error("Failed to load video: %s", e)
             return False
 
     def play(self):
@@ -742,7 +746,7 @@ class OverlayModel:
             return True
 
         except Exception as e:
-            print(f"[!] Failed to load DC file: {e}")
+            log.error("Failed to load DC file: %s", e)
             return False
 
 

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/paths.py

@@ -61,13 +61,18 @@ def read_sysfs(path: str) -> Optional[str]:
 
 
 def _has_actual_themes(theme_dir: str) -> bool:
-    """Check if a Theme* directory has actual theme subfolders (not just .gitkeep)."""
+    """Check if a Theme* directory has actual theme subfolders (not just placeholders).
+
+    Skips dotfiles and Custom_* placeholder dirs that ship with the wheel
+    but don't contain downloadable default themes.
+    """
     if not os.path.isdir(theme_dir):
         return False
     for item in os.listdir(theme_dir):
-        # Theme subfolders are like "000a", "001b", etc.
         item_path = os.path.join(theme_dir, item)
-        if os.path.isdir(item_path) and not item.startswith('.'):
+        if (os.path.isdir(item_path)
+                and not item.startswith('.')
+                and not item.startswith('Custom_')):
             return True
     return False
 
@@ -88,15 +93,17 @@ def _find_data_dir() -> str:
 
     for candidate in candidates:
         if os.path.isdir(candidate):
-            # Check if this directory has Theme* folders with actual content
             for item in os.listdir(candidate):
                 if item.startswith('Theme'):
                     theme_path = os.path.join(candidate, item)
                     if _has_actual_themes(theme_path):
+                        log.debug("Data dir: %s (found themes in %s)", candidate, item)
                         return candidate
 
     # Fallback to trcc/data even if empty
-    return os.path.join(_THIS_DIR, 'data')
+    fallback = os.path.join(_THIS_DIR, 'data')
+    log.debug("Data dir: %s (fallback — no themes found yet)", fallback)
+    return fallback
 
 
 # Data directories
@@ -254,183 +261,130 @@ def _download_archive(url: str, dest_path: str, timeout: int = 60) -> bool:
     return False
 
 
-def _fetch_theme_archive(width: int, height: int) -> Optional[str]:
-    """Download a theme archive from GitHub if not bundled locally.
-
-    Checks the package data dir first, then the user data dir.
-    Downloads to user data dir (~/.trcc/data/) if not found anywhere.
-
-    Returns the path to the .7z file, or None if unavailable.
-    """
-    archive_name = f'Theme{width}{height}.7z'
-
-    # Check package data dir (bundled with pip install)
-    pkg_archive = os.path.join(DATA_DIR, archive_name)
-    if os.path.isfile(pkg_archive):
-        return pkg_archive
 
-    # Check user data dir (previously downloaded)
-    user_archive = os.path.join(USER_DATA_DIR, archive_name)
-    if os.path.isfile(user_archive):
-        return user_archive
-
-    # Download from GitHub
-    url = GITHUB_THEME_BASE_URL + archive_name
-    if _download_archive(url, user_archive):
-        return user_archive
+def _writable_target(preferred: str, fallback: str) -> str:
+    """Return preferred dir if writable, else fallback to user dir."""
+    try:
+        os.makedirs(preferred, exist_ok=True)
+        probe = os.path.join(preferred, '.write_test')
+        with open(probe, 'w') as f:
+            f.write('')
+        os.remove(probe)
+        return preferred
+    except OSError:
+        log.debug("Not writable: %s — using %s", preferred, fallback)
+        return fallback
 
-    return None
 
+def _fetch_and_extract(
+    label: str,
+    pkg_dir: str,
+    user_dir: str,
+    archive_name: str,
+    check_fn,
+    fetch_fn,
+) -> bool:
+    """Unified fetch-and-extract for themes, web previews, and masks.
 
-def ensure_themes_extracted(width: int, height: int) -> bool:
-    """Extract default themes from .7z archive if not already present.
+    1. Check pkg_dir and user_dir for existing content via check_fn.
+    2. If neither has content, locate or download the .7z via fetch_fn.
+    3. Extract to the first writable directory.
 
-    Checks both the package data dir and user data dir for themes.
-    If the .7z archive is not found locally, downloads it from GitHub.
+    Returns True if content is available after this call.
     """
-    # Check package data dir first
-    theme_dir = get_theme_dir(width, height)
-    if _has_actual_themes(theme_dir):
+    if check_fn(pkg_dir):
+        log.debug("%s: found at %s", label, pkg_dir)
         return True
-
-    # Check user data dir
-    user_theme_dir = os.path.join(USER_DATA_DIR, f'Theme{width}{height}')
-    if _has_actual_themes(user_theme_dir):
+    if check_fn(user_dir):
+        log.debug("%s: found at %s", label, user_dir)
         return True
 
-    log.info("Themes not found for %dx%d — fetching archive...", width, height)
+    log.info("%s not found — fetching %s ...", label, archive_name)
 
-    # Find or download the archive
-    archive = _fetch_theme_archive(width, height)
+    archive = fetch_fn(archive_name)
     if archive is None:
-        log.warning("Could not obtain Theme%d%d.7z (no local archive, download failed)", width, height)
+        log.warning("%s: could not obtain %s (no local copy, download failed)", label, archive_name)
         return False
 
-    # Extract to whichever dir is writable (prefer package dir, fall back to user)
-    target = theme_dir
-    try:
-        os.makedirs(target, exist_ok=True)
-        # Test writability
-        test_file = os.path.join(target, '.write_test')
-        with open(test_file, 'w') as f:
-            f.write('')
-        os.remove(test_file)
-    except OSError:
-        target = user_theme_dir
-
+    target = _writable_target(pkg_dir, user_dir)
     ok = _extract_7z(archive, target)
     if ok:
-        log.info("Themes ready at %s", target)
+        log.info("%s ready at %s", label, target)
+    else:
+        log.warning("%s: extraction of %s failed", label, archive_name)
     return ok
 
 
-def _fetch_web_archive(archive_name: str) -> Optional[str]:
-    """Download a Web archive from GitHub if not bundled locally.
-
-    Checks the package Web dir first, then the user data dir.
-    Downloads to user data dir (~/.trcc/data/Web/) if not found.
-
-    Returns the path to the .7z file, or None if unavailable.
-    """
-    pkg_archive = os.path.join(DATA_DIR, 'Web', archive_name)
-    if os.path.isfile(pkg_archive):
-        return pkg_archive
+def _fetch_theme_archive_by_name(archive_name: str) -> Optional[str]:
+    """Locate or download a Theme .7z archive."""
+    pkg = os.path.join(DATA_DIR, archive_name)
+    if os.path.isfile(pkg):
+        return pkg
+    user = os.path.join(USER_DATA_DIR, archive_name)
+    if os.path.isfile(user):
+        return user
+    url = GITHUB_THEME_BASE_URL + archive_name
+    if _download_archive(url, user):
+        return user
+    return None
 
-    user_archive = os.path.join(USER_DATA_DIR, 'Web', archive_name)
-    if os.path.isfile(user_archive):
-        return user_archive
 
+def _fetch_web_archive(archive_name: str) -> Optional[str]:
+    """Locate or download a Web .7z archive."""
+    pkg = os.path.join(DATA_DIR, 'Web', archive_name)
+    if os.path.isfile(pkg):
+        return pkg
+    user = os.path.join(USER_DATA_DIR, 'Web', archive_name)
+    if os.path.isfile(user):
+        return user
     url = GITHUB_THEME_BASE_URL + 'Web/' + archive_name
-    if _download_archive(url, user_archive):
-        return user_archive
-
+    if _download_archive(url, user):
+        return user
     return None
 
 
-def ensure_web_extracted(width: int, height: int) -> bool:
-    """Extract cloud theme previews from .7z archive if not already present.
-
-    Checks both package and user data dirs. Downloads from GitHub if needed.
-    """
-    def check_fn(d: str) -> bool:
-        return os.path.isdir(d) and bool(os.listdir(d))
-    res_key = f'{width}{height}'
-
-    # Check package data dir
-    web_dir = get_web_dir(width, height)
-    if check_fn(web_dir):
-        return True
-
-    # Check user data dir
-    user_web_dir = os.path.join(USER_DATA_DIR, 'Web', res_key)
-    if check_fn(user_web_dir):
-        return True
+def ensure_themes_extracted(width: int, height: int) -> bool:
+    """Extract default themes from .7z archive if not already present."""
+    name = f'Theme{width}{height}'
+    return _fetch_and_extract(
+        label=f"Themes {width}x{height}",
+        pkg_dir=os.path.join(DATA_DIR, name),
+        user_dir=os.path.join(USER_DATA_DIR, name),
+        archive_name=f'{name}.7z',
+        check_fn=_has_actual_themes,
+        fetch_fn=_fetch_theme_archive_by_name,
+    )
 
-    log.info("Web previews not found for %dx%d — fetching archive...", width, height)
 
-    # Find or download archive
-    archive = _fetch_web_archive(f'{res_key}.7z')
-    if archive is None:
-        log.warning("Could not obtain %s.7z (no local archive, download failed)", res_key)
-        return False
+def _has_any_content(d: str) -> bool:
+    """Check if a directory exists and has any files/subdirs."""
+    return os.path.isdir(d) and bool(os.listdir(d))
 
-    # Extract to writable location
-    target = web_dir
-    try:
-        os.makedirs(target, exist_ok=True)
-        test_file = os.path.join(target, '.write_test')
-        with open(test_file, 'w') as f:
-            f.write('')
-        os.remove(test_file)
-    except OSError:
-        target = user_web_dir
 
-    ok = _extract_7z(archive, target)
-    if ok:
-        log.info("Web previews ready at %s", target)
-    return ok
+def ensure_web_extracted(width: int, height: int) -> bool:
+    """Extract cloud theme previews from .7z archive if not already present."""
+    res_key = f'{width}{height}'
+    return _fetch_and_extract(
+        label=f"Web previews {width}x{height}",
+        pkg_dir=os.path.join(DATA_DIR, 'Web', res_key),
+        user_dir=os.path.join(USER_DATA_DIR, 'Web', res_key),
+        archive_name=f'{res_key}.7z',
+        check_fn=_has_any_content,
+        fetch_fn=_fetch_web_archive,
+    )
 
 
 def ensure_web_masks_extracted(width: int, height: int) -> bool:
-    """Extract cloud mask themes from .7z archive if not already present.
-
-    Checks both package and user data dirs. Downloads from GitHub if needed.
-    """
+    """Extract cloud mask themes from .7z archive if not already present."""
     res_key = f'zt{width}{height}'
-
-    # Check package data dir
-    masks_dir = get_web_masks_dir(width, height)
-    if _has_actual_themes(masks_dir):
-        return True
-
-    # Check user data dir
-    user_masks_dir = os.path.join(USER_DATA_DIR, 'Web', res_key)
-    if _has_actual_themes(user_masks_dir):
-        return True
-
-    log.info("Mask themes not found for %dx%d — fetching archive...", width, height)
-
-    # Find or download archive
-    archive = _fetch_web_archive(f'{res_key}.7z')
-    if archive is None:
-        log.warning("Could not obtain %s.7z (no local archive, download failed)", res_key)
-        return False
-
-    # Extract to writable location
-    target = masks_dir
-    try:
-        os.makedirs(target, exist_ok=True)
-        test_file = os.path.join(target, '.write_test')
-        with open(test_file, 'w') as f:
-            f.write('')
-        os.remove(test_file)
-    except OSError:
-        target = user_masks_dir
-
-    ok = _extract_7z(archive, target)
-    if ok:
-        log.info("Mask themes ready at %s", target)
-    return ok
+    return _fetch_and_extract(
+        label=f"Mask themes {width}x{height}",
+        pkg_dir=os.path.join(DATA_DIR, 'Web', res_key),
+        user_dir=os.path.join(USER_DATA_DIR, 'Web', res_key),
+        archive_name=f'{res_key}.7z',
+        check_fn=_has_actual_themes,
+        fetch_fn=_fetch_web_archive,
+    )
 
 
 def find_resource(filename: str, search_paths: Optional[list] = None) -> Optional[str]:

{trcc_linux-1.2.1 → trcc_linux-1.2.3}/src/trcc/qt_components/assets.py

@@ -6,12 +6,15 @@ Images are extracted from Windows TRCC resources using tools/extract_resx_images
 """
 from __future__ import annotations
 
+import logging
 from functools import lru_cache
 from pathlib import Path
 
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QPixmap
 
+log = logging.getLogger(__name__)
+
 # Asset directory (relative to this file)
 ASSETS_DIR = Path(__file__).parent.parent / 'assets' / 'gui'
 
@@ -45,7 +48,7 @@ def load_pixmap(name: str, scale_width: int | None = None, scale_height: int | N
     """
     path = get_asset_path(name)
     if not path.exists():
-        print(f"[!] Asset not found: {name}")
+        log.warning("Asset not found: %s", name)
         return QPixmap()
 
     pixmap = QPixmap(str(path))