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

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

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

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

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

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "1.2.3"
+__version__ = "1.2.4"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -21,3 +21,5 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #         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.3 → 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.3 → trcc_linux-1.2.4}/src/trcc/paths.py

@@ -262,20 +262,6 @@ def _download_archive(url: str, dest_path: str, timeout: int = 60) -> bool:
 
 
 
-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
-
-
 def _fetch_and_extract(
     label: str,
     pkg_dir: str,
@@ -286,9 +272,9 @@ def _fetch_and_extract(
 ) -> bool:
     """Unified fetch-and-extract for themes, web previews, and masks.
 
-    1. Check pkg_dir and user_dir for existing content via check_fn.
+    1. Check pkg_dir (dev mode) 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.
+    3. Always extract to user_dir (~/.trcc/data/) so data survives pip upgrades.
 
     Returns True if content is available after this call.
     """
@@ -306,10 +292,12 @@ def _fetch_and_extract(
         log.warning("%s: could not obtain %s (no local copy, download failed)", label, archive_name)
         return False
 
-    target = _writable_target(pkg_dir, user_dir)
-    ok = _extract_7z(archive, target)
+    # Always extract to user_dir (~/.trcc/data/) — survives pip upgrades.
+    # site-packages gets wiped on `pip install --upgrade`.
+    os.makedirs(user_dir, exist_ok=True)
+    ok = _extract_7z(archive, user_dir)
     if ok:
-        log.info("%s ready at %s", label, target)
+        log.info("%s ready at %s", label, user_dir)
     else:
         log.warning("%s: extraction of %s failed", label, archive_name)
     return ok

{trcc_linux-1.2.3 → trcc_linux-1.2.4}/tests/test_cli.py

@@ -1387,27 +1387,31 @@ class TestHr10Tempd(unittest.TestCase):
 class TestInstallDesktop(unittest.TestCase):
     """Tests for install_desktop() command."""
 
-    def test_missing_desktop_file(self):
-        """Returns 1 when trcc.desktop not found at expected path."""
+    def test_installs_without_repo_root(self):
+        """Succeeds even when __file__ points outside repo (pip install)."""
         with tempfile.TemporaryDirectory() as tmpdir:
-            # Point __file__ to a fake path where trcc.desktop won't exist
-            fake_file = os.path.join(tmpdir, "src", "trcc", "cli.py")
+            home = Path(tmpdir) / "fakehome"
+            # Fake __file__ with no icons dir — should still create .desktop
+            fake_file = os.path.join(tmpdir, "site-packages", "trcc", "cli.py")
             os.makedirs(os.path.dirname(fake_file), exist_ok=True)
             Path(fake_file).touch()
-            with patch('trcc.cli.__file__', fake_file):
+            with patch('trcc.cli.__file__', fake_file), \
+                 patch('pathlib.Path.home', return_value=home):
                 result = install_desktop()
-        self.assertEqual(result, 1)
+            self.assertEqual(result, 0)
+            desktop = home / ".local" / "share" / "applications" / "trcc.desktop"
+            self.assertTrue(desktop.exists())
+            self.assertIn("Exec=trcc gui", desktop.read_text())
 
     def test_installs_files(self):
-        """install_desktop() copies .desktop and icon files to home dir."""
+        """install_desktop() creates .desktop and copies icons to home dir."""
         with tempfile.TemporaryDirectory() as tmpdir:
             home = Path(tmpdir)
             with patch('pathlib.Path.home', return_value=home):
                 result = install_desktop()
-            # Running from repo, should find trcc.desktop
-            if result == 0:
-                desktop = home / ".local" / "share" / "applications" / "trcc.desktop"
-                self.assertTrue(desktop.exists())
+            self.assertEqual(result, 0)
+            desktop = home / ".local" / "share" / "applications" / "trcc.desktop"
+            self.assertTrue(desktop.exists())
 
     def test_dispatch_install_desktop(self):
         """main() dispatches 'install-desktop' to install_desktop()."""

{trcc_linux-1.2.3 → trcc_linux-1.2.4}/tests/test_paths.py

@@ -390,6 +390,7 @@ class TestEnsureThemesExtracted(unittest.TestCase):
         """Calls _extract_7z when archive exists but themes don't."""
         with tempfile.TemporaryDirectory() as d:
             theme_dir = os.path.join(d, 'Theme320320')
+            user_theme_dir = os.path.join(d, 'user', 'Theme320320')
             archive = theme_dir + '.7z'
             Path(archive).touch()
             with patch('trcc.paths.get_theme_dir', return_value=theme_dir), \
@@ -398,7 +399,8 @@ class TestEnsureThemesExtracted(unittest.TestCase):
                  patch('trcc.paths._extract_7z', return_value=True) as mock_ex:
                 result = ensure_themes_extracted(320, 320)
             self.assertTrue(result)
-            mock_ex.assert_called_once_with(archive, theme_dir)
+            # Extracts to user_dir (~/.trcc/data/) so data survives pip upgrades
+            mock_ex.assert_called_once_with(archive, user_theme_dir)
 
 
 class TestEnsureWebExtracted(unittest.TestCase):
@@ -426,6 +428,7 @@ class TestEnsureWebExtracted(unittest.TestCase):
     def test_extracts_from_archive(self):
         with tempfile.TemporaryDirectory() as d:
             web_dir = os.path.join(d, 'Web', '320320')
+            user_web_dir = os.path.join(d, 'user', 'Web', '320320')
             archive_dir = os.path.join(d, 'Web')
             os.makedirs(archive_dir)
             archive = os.path.join(archive_dir, '320320.7z')
@@ -436,7 +439,7 @@ class TestEnsureWebExtracted(unittest.TestCase):
                  patch('trcc.paths._extract_7z', return_value=True) as mock_ex:
                 result = ensure_web_extracted(320, 320)
             self.assertTrue(result)
-            mock_ex.assert_called_once_with(archive, web_dir)
+            mock_ex.assert_called_once_with(archive, user_web_dir)
 
 
 class TestEnsureWebMasksExtracted(unittest.TestCase):