trcc-linux 9.2.5__tar.gz → 9.2.6__tar.gz

{trcc_linux-9.2.5 → trcc_linux-9.2.6}/PKG-INFO

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

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

{trcc_linux-9.2.5 → trcc_linux-9.2.6}/src/trcc/__version__.py

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

{trcc_linux-9.2.5 → trcc_linux-9.2.6}/src/trcc/adapters/infra/data_repository.py

@@ -403,20 +403,22 @@ class DataManager:
         height: int,
         progress_fn: Optional[callable] = None,  # type: ignore[type-arg]
     ) -> None:
-        """Download + extract all archives for a resolution (skips if already done).
+        """Ensure all archives are extracted for a resolution (idempotent).
+
+        Each ensure_* checks for existing content before extracting, so this is
+        safe to call every startup. Non-square devices also ensure both
+        orientations so rotating immediately shows local content.
 
         progress_fn: optional callable(str) — called with a status message at
         each step so CLI adapters can print progress.  GUI/API pass None.
         """
-        if DataManager.is_resolution_installed(width, height):
-            return
-
         def _report(msg: str) -> None:
             if progress_fn is not None:
                 progress_fn(msg)
             else:
                 log.info(msg)
 
+        # All ensure_* are idempotent — each checks for existing content before extracting
         _report(f"Downloading themes for {width}x{height}...")
         DataManager.ensure_themes(width, height)
         _report(f"Downloading web previews for {width}x{height}...")
@@ -424,7 +426,6 @@ class DataManager:
         _report(f"Downloading mask themes for {width}x{height}...")
         DataManager.ensure_web_masks(width, height)
         if width != height:
-            # Non-square devices support portrait/landscape rotation — ensure both
             _report(f"Downloading web previews for {height}x{width}...")
             DataManager.ensure_web(height, width)
             _report(f"Downloading mask themes for {height}x{width}...")

{trcc_linux-9.2.5 → trcc_linux-9.2.6}/tests/adapters/infra/test_data_repository.py

@@ -661,12 +661,55 @@ class TestEnsureAll(unittest.TestCase):
         self.assertIn((1280, 480), mask_calls)
         self.assertIn((480, 1280), mask_calls)
 
-    def test_skips_if_already_installed(self):
-        """ensure_all is a no-op when resolution is already installed."""
+    def test_always_runs_all_ensures(self):
+        """ensure_all always calls all ensure_* — each is idempotent internally."""
         with patch.object(DataManager, 'is_resolution_installed', return_value=True), \
-             patch.object(DataManager, 'ensure_themes') as mock_themes:
+             patch.object(DataManager, 'mark_resolution_installed'), \
+             patch.object(DataManager, 'ensure_themes') as mock_themes, \
+             patch.object(DataManager, 'ensure_web') as mock_web, \
+             patch.object(DataManager, 'ensure_web_masks') as mock_masks:
             DataManager.ensure_all(320, 320)
-        mock_themes.assert_not_called()
+        mock_themes.assert_called_once_with(320, 320)
+        mock_web.assert_called_once_with(320, 320)
+        mock_masks.assert_called_once_with(320, 320)
+
+    def test_non_square_extracts_correct_archive_paths(self):
+        """Fixture test: ensure_all extracts all 5 archives for a 1280x480 device.
+
+        Verifies the real archive path construction — landscape theme + web + masks
+        AND portrait web + masks — using a tempdir with fake .7z files.
+        """
+        with tempfile.TemporaryDirectory() as d:
+            pkg = d
+            user = os.path.join(d, 'user')
+
+            # Create all expected archives in the package data dir
+            web_dir = os.path.join(pkg, 'web')
+            os.makedirs(web_dir)
+            archives = {
+                'theme': os.path.join(pkg, 'theme1280480.7z'),
+                'web_ls': os.path.join(web_dir, '1280480.7z'),
+                'mask_ls': os.path.join(web_dir, 'zt1280480.7z'),
+                'web_pt': os.path.join(web_dir, '4801280.7z'),
+                'mask_pt': os.path.join(web_dir, 'zt4801280.7z'),
+            }
+            for path in archives.values():
+                Path(path).touch()
+
+            extracted = []
+            with patch('trcc.adapters.infra.data_repository._PKG_DATA_DIR', pkg), \
+                 patch.object(DataManager, '_data_dir', staticmethod(lambda: user)), \
+                 patch.object(DataManager, 'mark_resolution_installed'), \
+                 patch.object(DataManager, 'extract_7z',
+                              side_effect=lambda arc, dst: extracted.append(arc) or True):
+                DataManager.ensure_all(1280, 480)
+
+            extracted_names = [os.path.basename(p) for p in extracted]
+            self.assertIn('theme1280480.7z', extracted_names)
+            self.assertIn('1280480.7z',      extracted_names)
+            self.assertIn('zt1280480.7z',    extracted_names)
+            self.assertIn('4801280.7z',      extracted_names)
+            self.assertIn('zt4801280.7z',    extracted_names)
 
 
 # -- download_archive SSL ---------------------------------------------------