trcc-linux 1.2.2__tar.gz → 1.2.4__tar.gz

{trcc_linux-1.2.2 → trcc_linux-1.2.4}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "1.2.2"
+version = "1.2.4"
 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.2 → trcc_linux-1.2.4}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "1.2.2"
+__version__ = "1.2.4"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -19,3 +19,7 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #         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
+# 1.2.4 - Fix pip upgrade wiping themes: extract to ~/.trcc/data/ not site-packages,
+#         fix install-desktop for pip installs (generate .desktop inline)

{trcc_linux-1.2.2 → trcc_linux-1.2.4}/src/trcc/cli.py

@@ -958,51 +958,57 @@ def setup_udev(dry_run=False):
 
 
 def install_desktop():
-    """Install .desktop menu entry and icon for app launchers."""
+    """Install .desktop menu entry and icon for app launchers.
+
+    Works from both pip install and git clone — generates .desktop inline
+    and resolves icons from the package tree (src/trcc/assets/icons/).
+    """
     import shutil
     from pathlib import Path
 
     home = Path.home()
     app_dir = home / ".local" / "share" / "applications"
-    icon_dir = home / ".local" / "share" / "icons" / "hicolor" / "256x256" / "apps"
 
-    # Find repo root (where trcc.desktop lives)
-    repo_root = Path(__file__).parent.parent.parent
-    desktop_src = repo_root / "trcc.desktop"
-    icon_src = repo_root / "src" / "trcc" / "assets" / "icons" / "trcc_256x256.png"
-
-    if not desktop_src.exists():
-        print(f"Error: {desktop_src} not found. Run from the repo directory.")
-        return 1
+    # Icons live inside the package (works for both pip install and git clone)
+    icon_pkg_dir = Path(__file__).parent / "assets" / "icons"
+
+    # Generate .desktop content inline (no dependency on repo root)
+    desktop_content = """\
+[Desktop Entry]
+Name=TRCC Linux
+Comment=Thermalright LCD Control Center
+Exec=trcc gui
+Icon=trcc
+Terminal=false
+Type=Application
+Categories=Utility;System;
+Keywords=thermalright;lcd;cooler;aio;cpu;
+"""
 
     # Install .desktop file
     app_dir.mkdir(parents=True, exist_ok=True)
     desktop_dst = app_dir / "trcc.desktop"
-    shutil.copy2(desktop_src, desktop_dst)
+    desktop_dst.write_text(desktop_content)
     print(f"Installed {desktop_dst}")
 
-    # Install icon
-    if icon_src.exists():
-        icon_dir.mkdir(parents=True, exist_ok=True)
-        icon_dst = icon_dir / "trcc.png"
-        shutil.copy2(icon_src, icon_dst)
-        print(f"Installed {icon_dst}")
-
-        # Also install smaller sizes
-        for size in [48, 64, 128]:
-            small_src = icon_src.parent / f"trcc_{size}x{size}.png"
-            if small_src.exists():
-                small_dir = home / ".local" / "share" / "icons" / "hicolor" / f"{size}x{size}" / "apps"
-                small_dir.mkdir(parents=True, exist_ok=True)
-                shutil.copy2(small_src, small_dir / "trcc.png")
+    # Install icons to XDG hicolor theme
+    installed_icon = False
+    for size in [256, 128, 64, 48]:
+        icon_src = icon_pkg_dir / f"trcc_{size}x{size}.png"
+        if icon_src.exists():
+            icon_dir = home / ".local" / "share" / "icons" / "hicolor" / f"{size}x{size}" / "apps"
+            icon_dir.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(icon_src, icon_dir / "trcc.png")
+            installed_icon = True
+
+    if installed_icon:
+        # Update icon cache
+        subprocess.run(
+            ["gtk-update-icon-cache", str(home / ".local" / "share" / "icons" / "hicolor")],
+            check=False, capture_output=True
+        )
     else:
-        print("Warning: icon not found, menu entry will use a generic icon")
-
-    # Update icon cache
-    subprocess.run(
-        ["gtk-update-icon-cache", str(home / ".local" / "share" / "icons" / "hicolor")],
-        check=False, capture_output=True
-    )
+        print("Warning: icons not found, menu entry will use a generic icon")
 
     print("\nTRCC should now appear in your application menu.")
     print("If it doesn't show up immediately, log out and back in.")

{trcc_linux-1.2.2 → trcc_linux-1.2.4}/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.2 → trcc_linux-1.2.4}/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.2 → trcc_linux-1.2.4}/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