dzgui/api/mods.py

@@ -49,7 +49,6 @@ def get_local_mods(workshop_path: Path) -> list[Path]:
     mods = [file for file in workshop_path.iterdir() if file.is_dir()]
     return mods
 
-
 def is_mission(path: Path) -> bool:
     # TODO: parse integrity of other files
     parent = path.parent.name
@@ -58,10 +57,9 @@ def is_mission(path: Path) -> bool:
     file = path / "init.c"
     return file.exists()
 
-
 def tokenize(mod: Path) -> dict[str, Any] | None:
     file = mod.joinpath("meta.cpp")
-    delimiter = r"\s*=\s*"
+    delimiter=r"\s*=\s*"
     modmeta = {}
     try:
         with open(file, "r", encoding="utf-8") as f:
@@ -78,7 +76,6 @@ def tokenize(mod: Path) -> dict[str, Any] | None:
         logger.critical(e)
         return None
 
-
 def get_mod_size(path: Path) -> float:
     s = 0
     for f in path.rglob("*"):
@@ -126,27 +123,20 @@ def _hash(uid: str, use_custom: bool = False) -> str:
     return prefix + md5.hexdigest()[:8]
 
 
-def remove_stale_signatures(
-    config: Path, versions: Path, ids: list[int] | None = None
-) -> None:
+def remove_stale_signatures(config: Path, versions: Path) -> None:
     if versions.is_file() is False:
         logger.warning("Creating new version signatures file")
         versions.touch()
         return
-
     path = lookup(config, Preferences.DEFAULT)
     steam_path = Path(path)
-    if ids is None:
-        local_ids = get_local_mod_ids(steam_path)
-
+    ids = get_local_mod_ids(steam_path)
     with open(versions, "r") as f:
         lines = f.readlines()
-
-    if ids is None:
-        lines = [line for line in lines if int(line.split(",")[0]) in local_ids]
-    else:
-        lines = [line for line in lines if int(line.split(",")[0]) not in ids]
-
+    for line in lines:
+        uid = int(line.split(",")[0])
+        if uid not in ids:
+            lines.remove(line)
     with open(versions, "w") as f:
         for line in lines:
             f.write(line)

dzgui/controllers/emitter.py

@@ -81,8 +81,8 @@ class Emitter(GObject.GObject):
     def distcalc_started(self) -> None:
         pass
 
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(bool, int))
-    def mod_page_toggled(self, state: bool, mods: int) -> None:
+    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(bool,))
+    def mod_page_toggled(self, state: bool) -> None:
         pass
 
     @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(bool,))

dzgui/init/proc.py

@@ -1,7 +1,6 @@
 import psutil
 import subprocess
 import shutil
-import logging
 
 from warnings import deprecated
 

dzgui/managers/mods.py

@@ -118,7 +118,8 @@ class ModManager:
             self.thread_man.increment_dialog()
             time.sleep(API_RATE_LIMIT)
 
-        func = StoredFunc(self._on_mods_unsubbed, mods)
+        iters = [_iter for mod, _iter in mods]
+        func = StoredFunc(self._on_mods_unsubbed, iters)
         self.thread_man.set_cleanup_func(func)
 
     def unsub_atomic_mod(self, mod: str) -> None:
@@ -145,21 +146,18 @@ class ModManager:
             pass
         time.sleep(API_RATE_LIMIT)
 
-    def _on_mods_unsubbed(self, mod_iter: list[tuple[str, Gtk.TreeIter]]) -> None:
-        mods = [int(mod) for mod, _iter in mod_iter]
-        iters = [_iter for mod, _iter in mod_iter]
+    def _on_mods_unsubbed(self, iters: list[Gtk.TreeIter]) -> None:
         if self.store is None:
             return
         for _iter in iters:
             self.store.remove(_iter)
-        # TODO: process config path in called function
-        remove_stale_signatures(self.prefs.paths.config, self.prefs.paths.version, mods)
+        remove_stale_signatures(self.prefs.paths.config, self.prefs.paths.version)
         model = self.treeview.get_model()
         if model is None:
             return
-        total_mods = len(model)
+        mods = len(model)
         msg = self.format_mod_statusbar()
-        self.emitter.emit("mods_updated", msg, total_mods)
+        self.emitter.emit("mods_updated", msg, mods)
 
     def uncolorize_mods(self) -> None:
         model = self.treeview.get_model()

dzgui/views/components/mod_panel.py

@@ -80,18 +80,14 @@ class ModSelectionPanel(Gtk.Box):
         self.highlight_stale_button.set_sensitive(True)
 
     def _on_mods_updated(self, emitter: "Emitter", msg: str, mods: int) -> None:
-        self._toggle_panel_sensitivity(mods)
-
-    def _toggle_panel_sensitivity(self, mods: int) -> None:
-        state = bool(mods)
-        for el in self.main_panel, self.stale_panel:
-            el.set_sensitive(state)
+        if mods < 1:
+            self.main_panel.set_sensitive(False)
+            self.stale_panel.set_sensitive(False)
 
     def _on_mods_highlighted(self, emitter: "Emitter") -> None:
         self.swap_sensitive(True)
 
-    def _on_mod_page_toggled(self, emitter: "Emitter", state: bool, mods: int) -> None:
-        self._toggle_panel_sensitivity(mods)
+    def _on_mod_page_toggled(self, emitter: "Emitter", state: bool) -> None:
         self.set_visible(state)
 
     def swap_sensitive(self, state: bool) -> None:

dzgui/views/pages/mods.py

@@ -64,15 +64,10 @@ class Mods(Gtk.Box):
         self.controller.open_offline()
 
     def _on_unmap(self, widget: Self) -> None:
-        self.emitter.emit("mod_page_toggled", False, 0)
+        self.emitter.emit("mod_page_toggled", False)
 
     def _on_map(self, widget: Self) -> None:
-        model = self.tree.get_model()
-        if model is None:
-            mods = 0
-        else:
-            mods = len(model)
-        self.emitter.emit("mod_page_toggled", True, mods)
+        self.emitter.emit("mod_page_toggled", True)
         # TODO: delegation
         # NOTE: handles going back from offline mods page
         # more generic cache restoration method

tests/fixtures/dzg.versions

@@ -1,8 +0,0 @@
-1559212036,1771519119
-1564026768,1770917948
-2545327648,1780174455
-2276010135,1756744083
-1654462998,1780501511
-3410710885,1752864732
-2918418331,1780413260
-3739934289,1780855136

tests/test_mod_signatures.py

@@ -1,52 +0,0 @@
-import pytest
-import shutil
-import tempfile
-
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-import dzgui.api.mods
-import dzgui.config.query
-
-from tests.fixtures import fixture_path
-
-if TYPE_CHECKING:
-    from dzgui.const.enums import Preferences
-
-pytestmark = pytest.mark.mods
-
-@pytest.fixture
-def versions() -> str:
-    return fixture_path("dzg.versions")
-
-@pytest.fixture
-def tmp() -> str:
-    with tempfile.NamedTemporaryFile(delete=False) as f:
-        tmp = f.name
-    return tmp
-
-def mock_local_ids(path: Path) -> list[int]:
-    return [3410710885, 3739934289]
-
-def mock_lookup(path: Path, prefs: "Preferences") -> str:
-    return ""
-
-def test_signatures(monkeypatch, tmp: str, versions: str) -> None:
-    ids = [1559212036, 1654462998]
-    shutil.copyfile(versions, tmp)
-    path = Path(tmp)
-    monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
-    dzgui.api.mods.remove_stale_signatures(path, path, ids)
-    with open(tmp, "r") as f:
-        lines = f.readlines()
-    assert ids not in lines
-
-def test_signatures_with_no_ids(monkeypatch, tmp: str, versions: str) -> None:
-    shutil.copyfile(versions, tmp)
-    path = Path(tmp)
-    monkeypatch.setattr("dzgui.api.mods.get_local_mod_ids", mock_local_ids)
-    monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
-    dzgui.api.mods.remove_stale_signatures(path, path)
-    with open(tmp, "r") as f:
-        lines = f.readlines()
-    assert lines == ["3410710885,1752864732\n", "3739934289,1780855136\n"]