trcc-linux 3.0.6__tar.gz → 3.0.8__tar.gz

{trcc_linux-3.0.6 → trcc_linux-3.0.8}/PKG-INFO

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

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

{trcc_linux-3.0.6 → trcc_linux-3.0.8}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "3.0.6"
+__version__ = "3.0.8"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -94,3 +94,13 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 # 3.0.6  - Single-instance guard: prevent duplicate systray entries on launch.
 #          Font size spinbox in overlay color picker (independent of font dialog).
 #          2167 tests.
+# 3.0.7  - Unified segment display renderer for all 11 LED device styles.
+#          OOP class hierarchy (SegmentDisplay ABC + 10 subclasses) with
+#          data/logic separation. Covers AX120, PA120, AK120, LC1, LF8,
+#          LF12, LF10, CZ1, LC2, LF11, LF15. LEDService generalized for
+#          all digit-display styles (not just AX120). 2291 tests.
+# 3.0.8  - Fix LED segment display: °C/°F toggle now propagates to segment
+#          renderer, CPU/GPU sensor source selector now filters phase cycling
+#          (show only CPU or GPU instead of always both). OOP refactor: move
+#          loose functions into classes across 5 files (conf.py, device_scsi.py,
+#          device_led_hr10.py, device_factory.py, device_hid.py). 2290 tests.

{trcc_linux-3.0.6 → trcc_linux-3.0.8}/src/trcc/cli.py

@@ -558,8 +558,8 @@ class DeviceCommands:
                 svc.select(svc.devices[0])
         elif not svc.selected:
             # Fall back to saved selection
-            from trcc.conf import get_selected_device
-            saved = get_selected_device()
+            from trcc.conf import Settings
+            saved = Settings.get_selected_device()
             if saved:
                 match = next((d for d in svc.devices if d.path == saved), None)
                 if match:
@@ -581,10 +581,10 @@ class DeviceCommands:
     @staticmethod
     def _get_driver(device=None):
         """Create an LCDDriver, resolving selected device and extracting archives."""
-        from trcc.conf import get_selected_device
+        from trcc.conf import Settings
         from trcc.device_lcd import LCDDriver
         if device is None:
-            device = get_selected_device()
+            device = Settings.get_selected_device()
         driver = LCDDriver(device_path=device)
         DeviceCommands._ensure_extracted(driver)
         return driver
@@ -684,7 +684,7 @@ class DeviceCommands:
     def detect(show_all=False):
         """Detect LCD device."""
         try:
-            from trcc.conf import get_selected_device
+            from trcc.conf import Settings
             from trcc.device_detector import check_udev_rules, detect_devices
 
             devices = detect_devices()
@@ -693,14 +693,14 @@ class DeviceCommands:
                 return 1
 
             if show_all:
-                selected = get_selected_device()
+                selected = Settings.get_selected_device()
                 for i, dev in enumerate(devices, 1):
                     marker = "*" if dev.scsi_device == selected else " "
                     print(f"{marker} [{i}] {DeviceCommands._format(dev, probe=True)}")
                 if len(devices) > 1:
                     print("\nUse 'trcc select N' to switch devices")
             else:
-                selected = get_selected_device()
+                selected = Settings.get_selected_device()
                 dev = None
                 if selected:
                     dev = next((d for d in devices if d.scsi_device == selected), None)
@@ -727,7 +727,7 @@ class DeviceCommands:
     def select(number):
         """Select a device by number."""
         try:
-            from trcc.conf import save_selected_device
+            from trcc.conf import Settings
             from trcc.device_detector import detect_devices
 
             devices = detect_devices()
@@ -740,7 +740,7 @@ class DeviceCommands:
                 return 1
 
             device = devices[number - 1]
-            save_selected_device(device.scsi_device)
+            Settings.save_selected_device(device.scsi_device)
             print(f"Selected: {device.scsi_device} ({device.product_name})")
             return 0
         except Exception as e:
@@ -948,9 +948,9 @@ class DisplayCommands:
             dev = svc.selected
 
             # Persist to device config
-            from trcc.conf import device_config_key, save_device_setting
-            key = device_config_key(dev.device_index, dev.vid, dev.pid)
-            save_device_setting(key, 'brightness_level', level)
+            from trcc.conf import Settings
+            key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
+            Settings.save_device_setting(key, 'brightness_level', level)
 
             print(f"Brightness set to L{level} ({percent}%) on {dev.path}")
             return 0
@@ -976,9 +976,9 @@ class DisplayCommands:
 
             dev = svc.selected
 
-            from trcc.conf import device_config_key, save_device_setting
-            key = device_config_key(dev.device_index, dev.vid, dev.pid)
-            save_device_setting(key, 'rotation', degrees)
+            from trcc.conf import Settings
+            key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
+            Settings.save_device_setting(key, 'rotation', degrees)
 
             print(f"Rotation set to {degrees}° on {dev.path}")
             return 0
@@ -1178,7 +1178,7 @@ class DisplayCommands:
         try:
             import time
 
-            from trcc.conf import device_config_key, get_device_config
+            from trcc.conf import Settings
             from trcc.services import DeviceService, ImageService
 
             svc = DeviceService()
@@ -1201,8 +1201,8 @@ class DisplayCommands:
                 if dev.protocol != "scsi":
                     continue
 
-                key = device_config_key(dev.device_index, dev.vid, dev.pid)
-                cfg = get_device_config(key)
+                key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
+                cfg = Settings.get_device_config(key)
                 theme_path = cfg.get("theme_path")
 
                 if not theme_path:
@@ -1313,11 +1313,7 @@ class ThemeCommands:
         try:
             from PIL import Image
 
-            from trcc.conf import (
-                device_config_key,
-                save_device_setting,
-                settings,
-            )
+            from trcc.conf import Settings, settings
             from trcc.data_repository import DataManager
             from trcc.services import ImageService, ThemeService
 
@@ -1357,9 +1353,9 @@ class ThemeCommands:
                 img = ImageService.resize(img, w, h)
 
                 # Apply saved adjustments
-                from trcc.conf import get_device_config
-                key = device_config_key(dev.device_index, dev.vid, dev.pid)
-                cfg = get_device_config(key)
+                from trcc.conf import Settings
+                key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
+                cfg = Settings.get_device_config(key)
                 brightness = {1: 25, 2: 50, 3: 100}.get(
                     cfg.get('brightness_level', 3), 100)
                 rotation = cfg.get('rotation', 0)
@@ -1369,7 +1365,7 @@ class ThemeCommands:
                 svc.send_pil(img, w, h)
 
                 # Save as last-used theme
-                save_device_setting(key, 'theme_path', str(match.path))
+                Settings.save_device_setting(key, 'theme_path', str(match.path))
                 print(f"Loaded '{match.name}' → {dev.path}")
             else:
                 print(f"Theme '{match.name}' has no background image.")
@@ -1400,9 +1396,9 @@ class ThemeCommands:
             w, h = dev.resolution
 
             # Load current background from last-used theme
-            from trcc.conf import device_config_key, get_device_config
-            key = device_config_key(dev.device_index, dev.vid, dev.pid)
-            cfg = get_device_config(key)
+            from trcc.conf import Settings
+            key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
+            cfg = Settings.get_device_config(key)
             theme_path = cfg.get('theme_path')
 
             bg = None
@@ -1765,7 +1761,7 @@ class DiagCommands:
     def _hid_debug_led(dev) -> None:
         """HID handshake diagnostic for LED devices (Type 1)."""
         from trcc.device_factory import LedProtocol
-        from trcc.device_led import PM_TO_STYLE, LedHandshakeInfo
+        from trcc.device_led import LedHandshakeInfo, PmRegistry
 
         protocol = LedProtocol(vid=dev.vid, pid=dev.pid)
         info = protocol.handshake()
@@ -1792,7 +1788,7 @@ class DiagCommands:
             print(f"  Segments   = {style.segment_count}")
             print(f"  Zones      = {style.zone_count}")
 
-        if info.pm in PM_TO_STYLE:
+        if info.pm in PmRegistry.PM_TO_STYLE:
             print(f"\n  Status: KNOWN device (PM {info.pm} in tables)")
         else:
             print(f"\n  Status: UNKNOWN PM byte ({info.pm})")
@@ -1871,8 +1867,8 @@ class DiagCommands:
             from trcc.device_led import (
                 LED_PID,
                 LED_VID,
-                PM_TO_STYLE,
                 LedHandshakeInfo,
+                PmRegistry,
             )
 
             print("LED Device Diagnostic")
@@ -1902,7 +1898,7 @@ class DiagCommands:
             print(f"  Segments:   {style.segment_count}")
             print(f"  Zones:      {style.zone_count}")
 
-            if info.pm in PM_TO_STYLE:
+            if info.pm in PmRegistry.PM_TO_STYLE:
                 print(f"\n  Status: KNOWN device (PM {info.pm} in tables)")
             else:
                 print(f"\n  Status: UNKNOWN PM byte ({info.pm})")
@@ -2160,10 +2156,10 @@ StartupWMClass=trcc-linux
         import shutil
         from pathlib import Path
 
-        from trcc.conf import clear_installed_resolutions
+        from trcc.conf import Settings
 
         # Clear resolution markers before wiping config dir
-        clear_installed_resolutions()
+        Settings.clear_installed_resolutions()
 
         home = Path.home()
 
@@ -2255,8 +2251,8 @@ StartupWMClass=trcc-linux
                 return 0
 
             if force:
-                from trcc.conf import clear_installed_resolutions
-                clear_installed_resolutions()
+                from trcc.conf import Settings
+                Settings.clear_installed_resolutions()
 
             return download_pack(pack, force=force)
 

trcc_linux-3.0.8/src/trcc/conf.py

@@ -0,0 +1,254 @@
+"""Application settings and config persistence for TRCC.
+
+Single source of truth for resolution, paths, preferences, and device settings.
+Config is stored at ~/.config/trcc/config.json (XDG-compliant).
+
+Usage:
+    from trcc.conf import settings, Settings
+
+    settings.width          # LCD width
+    settings.height         # LCD height
+    settings.resolution     # (width, height) tuple
+    settings.theme_dir      # ThemeDir for current resolution
+    settings.web_dir        # Cloud theme preview dir
+    settings.masks_dir      # Cloud mask overlay dir
+    settings.temp_unit      # 0=Celsius, 1=Fahrenheit
+
+    # Static settings operations
+    Settings.device_config_key(0, 0x87cd, 0x70db)
+    Settings.get_device_config(key)
+    Settings.save_device_setting(key, 'theme', 'dark')
+
+    # Low-level config access (module-level)
+    from trcc.conf import load_config, save_config
+"""
+from __future__ import annotations
+
+import json
+import logging
+import os
+from pathlib import Path
+from typing import Optional
+
+from .data_repository import (
+    USER_DATA_DIR,
+    DataManager,
+    ThemeDir,
+)
+
+log = logging.getLogger(__name__)
+
+# =========================================================================
+# Config file location (XDG-compliant)
+# =========================================================================
+
+_XDG_CONFIG = os.environ.get('XDG_CONFIG_HOME', os.path.expanduser('~/.config'))
+CONFIG_DIR = os.path.join(_XDG_CONFIG, 'trcc')
+CONFIG_PATH = os.path.join(CONFIG_DIR, 'config.json')
+
+# USBLCD (SCSI/RGB565) supported resolutions
+SUPPORTED_RESOLUTIONS = [
+    (240, 240),
+    (320, 320),
+    (480, 480),
+    (640, 480),
+]
+
+
+# =========================================================================
+# Low-level config persistence
+# =========================================================================
+
+def load_config() -> dict:
+    """Load user config from disk. Returns empty dict on missing/corrupt file."""
+    try:
+        with open(CONFIG_PATH, 'r') as f:
+            return json.load(f)
+    except (FileNotFoundError, json.JSONDecodeError, OSError):
+        return {}
+
+
+def save_config(config: dict):
+    """Save user config to disk."""
+    os.makedirs(CONFIG_DIR, exist_ok=True)
+    with open(CONFIG_PATH, 'w') as f:
+        json.dump(config, f, indent=2)
+
+
+# =========================================================================
+# Settings class — all config operations + singleton
+# =========================================================================
+
+class Settings:
+    """Application-wide settings singleton.
+
+    Static methods provide config operations (device, format, resolution).
+    Instance holds resolved paths and current state.
+    """
+
+    # --- Private persistence helpers (init-only / called by instance methods) ---
+
+    @staticmethod
+    def _get_saved_resolution() -> tuple[int, int]:
+        """Get saved LCD resolution, defaulting to (320, 320)."""
+        config = load_config()
+        res = config.get('resolution', [320, 320])
+        if isinstance(res, list) and len(res) == 2:
+            return (int(res[0]), int(res[1]))
+        return (320, 320)
+
+    @staticmethod
+    def _save_resolution(width: int, height: int):
+        """Persist LCD resolution to config."""
+        config = load_config()
+        config['resolution'] = [width, height]
+        save_config(config)
+
+    @staticmethod
+    def _get_saved_temp_unit() -> int:
+        """Get saved temperature unit. 0=Celsius, 1=Fahrenheit. Defaults to 0."""
+        return load_config().get('temp_unit', 0)
+
+    @staticmethod
+    def _save_temp_unit(unit: int):
+        """Persist temperature unit to config. 0=Celsius, 1=Fahrenheit."""
+        config = load_config()
+        config['temp_unit'] = unit
+        save_config(config)
+
+    # --- Public static methods (device config, format prefs, etc.) ---
+
+    @staticmethod
+    def get_selected_device() -> Optional[str]:
+        """Get CLI-selected device path (e.g. '/dev/sg0'). Returns None if unset."""
+        return load_config().get('selected_device')
+
+    @staticmethod
+    def save_selected_device(device_path: str):
+        """Persist CLI-selected device path."""
+        config = load_config()
+        config['selected_device'] = device_path
+        save_config(config)
+
+    @staticmethod
+    def device_config_key(index: int, vid: int, pid: int) -> str:
+        """Build per-device config key, e.g. '0:87cd_70db'."""
+        return f"{index}:{vid:04x}_{pid:04x}"
+
+    @staticmethod
+    def get_device_config(key: str) -> dict:
+        """Get per-device config dict. Returns empty dict if not found."""
+        return load_config().get('devices', {}).get(key, {})
+
+    @staticmethod
+    def save_device_setting(key: str, setting: str, value):
+        """Save a single setting for a device."""
+        config = load_config()
+        devices = config.setdefault('devices', {})
+        dev_cfg = devices.setdefault(key, {})
+        dev_cfg[setting] = value
+        save_config(config)
+
+    @staticmethod
+    def get_format_prefs() -> dict:
+        """Get saved format preferences. Keys: time_format, date_format, temp_unit."""
+        return load_config().get('format_prefs', {})
+
+    @staticmethod
+    def save_format_pref(key: str, value: int):
+        """Save a single format preference (e.g. time_format=1 for 12h)."""
+        config = load_config()
+        prefs = config.setdefault('format_prefs', {})
+        prefs[key] = value
+        save_config(config)
+
+    @staticmethod
+    def apply_format_prefs(overlay_config: dict) -> dict:
+        """Apply saved format prefs to an overlay config dict.
+
+        Theme DC defines element layout; user prefs override format fields.
+        Each element cherry-picks the relevant pref for its metric type.
+        """
+        prefs = Settings.get_format_prefs()
+        if not prefs:
+            return overlay_config
+        for entry in overlay_config.values():
+            if not isinstance(entry, dict):
+                continue
+            metric = entry.get('metric', '')
+            if metric == 'time' and 'time_format' in prefs:
+                entry['time_format'] = prefs['time_format']
+            elif metric == 'date' and 'date_format' in prefs:
+                entry['date_format'] = prefs['date_format']
+            if 'temp_unit' in prefs and 'metric' in entry:
+                entry['temp_unit'] = prefs['temp_unit']
+        return overlay_config
+
+    @staticmethod
+    def clear_installed_resolutions():
+        """Remove all resolution-installed markers (used by uninstall)."""
+        config = load_config()
+        config.pop("installed_resolutions", None)
+        save_config(config)
+
+    # --- Instance methods and properties ---
+
+    def __init__(self) -> None:
+        w, h = Settings._get_saved_resolution()
+        self._width = w
+        self._height = h
+
+        # Derived paths (resolved for current resolution)
+        self.theme_dir: Optional[ThemeDir] = None
+        self.web_dir: Optional[Path] = None
+        self.masks_dir: Optional[Path] = None
+
+        # User preferences
+        self.temp_unit: int = Settings._get_saved_temp_unit()
+
+        # Static paths
+        self.user_data_dir = Path(USER_DATA_DIR)
+
+        # Resolve for initial resolution
+        if w and h:
+            self._resolve_paths()
+
+    @property
+    def width(self) -> int:
+        return self._width
+
+    @property
+    def height(self) -> int:
+        return self._height
+
+    @property
+    def resolution(self) -> tuple[int, int]:
+        return (self._width, self._height)
+
+    def set_resolution(self, width: int, height: int, persist: bool = True) -> None:
+        """Update resolution and re-resolve all derived paths."""
+        if (width, height) == (self._width, self._height):
+            return
+        log.info("Settings: resolution %dx%d → %dx%d",
+                 self._width, self._height, width, height)
+        self._width = width
+        self._height = height
+        self._resolve_paths()
+        if persist:
+            Settings._save_resolution(width, height)
+
+    def set_temp_unit(self, unit: int) -> None:
+        """Set temperature unit (0=Celsius, 1=Fahrenheit) and persist."""
+        self.temp_unit = unit
+        Settings._save_temp_unit(unit)
+
+    def _resolve_paths(self) -> None:
+        """Resolve theme/web/mask directories for current resolution."""
+        w, h = self._width, self._height
+        self.theme_dir = ThemeDir.for_resolution(w, h)
+        self.web_dir = Path(DataManager.get_web_dir(w, h))
+        self.masks_dir = Path(DataManager.get_web_masks_dir(w, h))
+
+
+# Module-level singleton — import and use directly
+settings = Settings()

{trcc_linux-3.0.6 → trcc_linux-3.0.8}/src/trcc/core/controllers.py

@@ -659,6 +659,9 @@ class LEDController:
     def set_sensor_source(self, source: str) -> None:
         self._svc.set_sensor_source(source)
 
+    def set_seg_temp_unit(self, unit: str) -> None:
+        self._svc.set_seg_temp_unit(unit)
+
     def set_clock_format(self, is_24h: bool) -> None:
         self._svc.set_clock_format(is_24h)
 
@@ -673,6 +676,15 @@ class LEDController:
         self._svc._hr10_mode = (style_id == 13)
         if self._svc._hr10_mode:
             self._svc._update_hr10_mask()
+
+        # Activate segment display for all digit-display styles (1-11)
+        from ..device_led_segment import get_display
+        self._svc._seg_display = get_display(style_id)
+        self._svc._segment_mode = self._svc._seg_display is not None
+        if self._svc._segment_mode:
+            self._svc._seg_phase = 0
+            self._svc._seg_tick_count = 0
+            self._svc._update_segment_mask()
         self._fire_state_changed()
 
     @property

{trcc_linux-3.0.6 → trcc_linux-3.0.8}/src/trcc/debug_report.py

@@ -291,7 +291,7 @@ class DebugReport:
 
     def _handshake_led(self, dev, sec: _Section) -> None:
         from trcc.device_factory import LedProtocol
-        from trcc.device_led import PM_TO_STYLE, LedHandshakeInfo
+        from trcc.device_led import LedHandshakeInfo, PmRegistry
 
         protocol = LedProtocol(vid=dev.vid, pid=dev.pid)
         try:
@@ -302,7 +302,7 @@ class DebugReport:
                 return
 
             assert isinstance(info, LedHandshakeInfo)
-            known = "KNOWN" if info.pm in PM_TO_STYLE else "UNKNOWN"
+            known = "KNOWN" if info.pm in PmRegistry.PM_TO_STYLE else "UNKNOWN"
             style_info = ""
             if info.style:
                 style_info = (f", LEDs={info.style.led_count}, "