chore: update test decorator

dzgui/api/acf.py

@@ -2,7 +2,6 @@ import logging
 import re
 
 from collections.abc import Iterator
-from datetime import datetime
 from pathlib import Path
 from typing import Any
 from warnings import deprecated
@@ -70,28 +69,6 @@ class ACF:
         except StopIteration:
             return acf
 
-    def search_key(self, key: str) -> str:
-        return str(self.dict["AppState"][key])
-
-    def date_to_str(self, epoch: int) -> str | None:
-        if epoch == 0:
-            return None
-        return datetime.fromtimestamp(epoch).isoformat(" ")
-
-    def get_date_by_key(self, key: str) -> str | None:
-        try:
-            stamp = int(self.search_key(key))
-            return self.date_to_str(stamp)
-        except Exception as e:
-            logger.critical(e)
-            return None
-
-    def get_last_updated(self) -> str | None:
-        return self.get_date_by_key("LastUpdated")
-
-    def get_last_played(self) -> str | None:
-        return self.get_date_by_key("LastPlayed")
-
     def get_allows_downloads(self) -> int | None:
         try:
             # TODO: consider coercing strs to ints on initial import

dzgui/api/steam.py

@@ -12,6 +12,7 @@ from typing import Any, Generator, Union
 from warnings import deprecated
 
 from dzgui.api.acf import ACF
+from dzgui.const.endpoints import VALIDATE
 from dzgui.init.prereqs import has_any_client
 from dzgui.init.prereqs import has_flatpak_client, has_steam_client
 from dzgui.const.constants import (
@@ -316,10 +317,9 @@ def unsubscribe(key: str, mod: int) -> None:
     update_workshop(key, mod, UNSUB_ENDPOINT)
 
 
-@deprecated("Use subscribe()")
+def validate_mod(client: str, mod: str) -> None:
-def enqueue_mod(client: str, mod: str, appid: int) -> None:
     client_args = concat_bash_args(client)
-    subprocess.Popen([*client_args, "+workshop_download_item", str(appid), mod])
+    subprocess.Popen([*client_args, "+workshop_download_item", str(APPID_DAYZ), mod])
 
 
 @deprecated("Cf. https://github.com/ValveSoftware/steam-for-linux/issues/9672")
@@ -389,18 +389,6 @@ def get_running_app() -> int | None:
     return None
 
 
-def get_last_updated(path: Path, appid: int) -> str | None:
-    root_path = get_app_path(path, appid)
-    acf = root_path.joinpath(f"steamapps/appmanifest_{appid}.acf")
-    return ACF(acf).get_last_updated()
-
-
-def get_last_played(path: Path, appid: int) -> str | None:
-    root_path = get_app_path(path, appid)
-    acf = root_path.joinpath(f"steamapps/appmanifest_{appid}.acf")
-    return ACF(acf).get_last_played()
-
-
 def get_app_allows_downloads(path: Path, appid: int) -> bool:
     try:
         root_path = get_app_path(path, appid)
@@ -512,3 +500,10 @@ def get_app_name(appid: int) -> str | None:
     except Exception as e:
         logger.debug(e)
         return None
+
+
+@deprecated("Currently unused")
+def validate_dayz(client: str) -> None:
+    client_args = concat_bash_args(client)
+    uri = VALIDATE + str(APPID_DAYZ)
+    subprocess.Popen([*client_args, uri])

dzgui/const/endpoints.py

@@ -18,6 +18,7 @@ COORDS_API = "http://ip-api.com/json"
 # steam URIs
 WORKSHOP = "steam://url/CommunityFilePage/"
 OPEN_URL = "steam://openurl/"
+VALIDATE = "steam://validate/"
 
 # user facing
 GITHUB_PAGES = "https://aclist.github.io/dzgui/index"

dzgui/const/enum.py

@@ -157,6 +157,7 @@ class ContextMenu(EnumWithAttrs):
     COPY_SERVER_IP = {"label": strings.copy_ip}
     COPY_SERVER_NAME = {"label": strings.copy_name}
     UNSUB_MOD = {"label": strings.unsub_mod}
+    VALIDATE_MOD = {"label": strings.validate_mod}
     OPEN_WORKSHOP = {"label": strings.open_workshop}
     REFRESH_PLAYERS = {"label": strings.refresh_players}
     REMOVE_HISTORY = {"label": strings.remove_history}
@@ -172,7 +173,7 @@ class ContextMenuGroup(Enum):
     """
 
     SERVER_MOD = (ContextMenu.OPEN_WORKSHOP,)
-    MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD)
+    MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD, ContextMenu.VALIDATE_MOD)
     MOD_OFFLINE = (None,)
     LOG = (ContextMenu.COPY_LOG_CLIPBOARD,)
     SERVER_BROWSER = (
@@ -246,6 +247,10 @@ class ModButton(EnumWithAttrs):
         "label": strings.mod_panel.select_stale,
         "tooltip": strings.mod_panel.select_stale_tooltip,
     }
+    VALIDATE = {
+        "label": strings.mod_panel.validate,
+        "tooltip": strings.mod_panel.validate_tooltip,
+    }
 
 
 class ButtonType(EnumWithAttrs):

dzgui/controllers/mc.py

@@ -102,6 +102,16 @@ class Controller(GObject.GObject):
         except AttributeError:
             logger.critical(f"{attr} is not a valid AppNavigation attribute.")
 
+    def validate_mods(
+        self, treeview: Union["ModTreeView", "OfflineModTreeView", None] = None
+    ) -> None:
+        if treeview is None:
+            view = self.mediator.modtreeview
+        else:
+            view = treeview
+        mod_man = view.get_mod_man()
+        mod_man.validate_mods()
+
     def get_prefs(self) -> UserPrefs:
         return self.prefs
 

dzgui/managers/contextmenu.py

@@ -75,10 +75,14 @@ class ContextMenuManager:
 
         if isinstance(self.treeview, (ModTreeView, OfflineModTreeView)):
             match action:
-                case ContextMenu.UNSUB_MOD:
-                    self.controller.unsub_mods(self.treeview)
                 case ContextMenu.OPEN_WORKSHOP:
                     self.open_mod_page()
+                case ContextMenu.UNSUB_MOD:
+                    self.controller.unsub_mods(self.treeview)
+                case ContextMenu.VALIDATE_MOD:
+                    self.controller.validate_mods(self.treeview)
+                case _:
+                    pass
 
         if isinstance(self.treeview, LogTreeView):
             match action:

dzgui/managers/mods.py

@@ -4,7 +4,7 @@ import time
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from dzgui.api.steam import unsubscribe
+from dzgui.api.steam import unsubscribe, validate_mod
 from dzgui.api.mods import (
     get_delimited_mods,
     find_stale_mods,
@@ -85,7 +85,7 @@ class ModManager:
         total_mods = len(self.store)
         self.emitter.emit("mods_updated", msg, total_mods)
 
-    def unsub_mods(self) -> None:
+    def get_selected_mods(self) -> list[tuple[str, Gtk.TreeIter]]:
         sel = self.treeview.get_selection()
         model, pathlist = sel.get_selected_rows()
         # NOTE: reverse when multiple selection
@@ -96,6 +96,15 @@ class ModManager:
                 continue
             mod, _iter = res
             mods.append((mod, _iter))
+        return mods
+
+    def validate_mods(self) -> None:
+        mods = self.get_selected_mods()
+        self.thread_man.set_job_count(len(mods))
+        self.validate_all_mods(mods)
+
+    def unsub_mods(self) -> None:
+        mods = self.get_selected_mods()
         self.thread_man.set_job_count(len(mods))
         self.unsub_all_mods(mods)
 
@@ -109,6 +118,21 @@ class ModManager:
         mod = model.get_value(tree_iter, 2)
         return mod, tree_iter
 
+    def validate_atomic_mod(self, mod: str) -> None:
+        # NOTE: propagation to dayz exp will happen during
+        # subsequent symlink phase on connect
+        client = self.controller.query_config(Preferences.CLIENT)
+        validate_mod(client, mod)
+
+    @call_on_thread(dialogs.validating_mods)
+    def validate_all_mods(self, mods: list[tuple[str, Gtk.TreeIter]]) -> None:
+        for mod, _iter in mods:
+            self.validate_atomic_mod(mod)
+            self.thread_man.increment_dialog()
+            time.sleep(API_RATE_LIMIT)
+        func = StoredFunc(lambda: None)
+        self.thread_man.set_cleanup_func(func)
+
     @call_on_thread(dialogs.deleting_mods)
     def unsub_all_mods(self, mods: list[tuple[str, Gtk.TreeIter]]) -> None:
         for mod, _iter in mods:

dzgui/strings/dialogs.py

@@ -9,6 +9,7 @@ update_success = "Updated successfully. Please exit and relaunch."
 load_error_lan = "Failed to find any servers on your network.\nCheck the server query port or your firewall settings."
 fetching_mods = "Fetching mod metadata"
 deleting_mods = "Unsubscribing mods"
+validating_mods = "Validating mods"
 scanning_mods = "Scanning mods"
 parsing_mods = "Parsing mods"
 

dzgui/util/strings.py

@@ -31,6 +31,7 @@ show_details = "Show server details"
 refresh_players = "Refresh player count"
 open_workshop = "Open in Steam Workshop"
 unsub_mod = "Unsubscribe mod"
+validate_mod = "Validate mod"
 copy_name = "Copy name to clipboard"
 copy_ip = "Copy IP to clipboard"
 copy_log = "Copy record(s) to clipboard"
@@ -200,6 +201,8 @@ class ModPanelStrings:
     clear_highlights: str
     select_stale: str
     select_stale_tooltip: str
+    validate: str
+    validate_tooltip: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -319,6 +322,8 @@ mod_panel = ModPanelStrings(
     clear_highlights="Clears highlights and reverts the table to a default state",
     select_stale="Select stale",
     select_stale_tooltip="Only selects highlighted stale mods",
+    validate="Validate selected",
+    validate_tooltip="Validates selected mods and updates them if necessary",
 )
 
 

dzgui/views/components/mod_panel.py

@@ -50,6 +50,7 @@ class ModSelectionPanel(Gtk.Box):
             ModButton.SELECT_ALL,
             ModButton.UNSELECT_ALL,
             ModButton.UNSUB_SELECTED,
+            ModButton.VALIDATE,
         )
         for button in buttons:
             b = EnumeratedModButton(button)
@@ -114,3 +115,5 @@ class ModSelectionPanel(Gtk.Box):
                 self.swap_sensitive(False)
             case ModButton.SELECT_STALE:
                 self.controller.select_colorized()
+            case ModButton.VALIDATE:
+                self.controller.validate_mods()

dzgui/views/pages/options.py

@@ -2,7 +2,6 @@ from pathlib import Path
 from typing import Callable, TYPE_CHECKING
 
 from dzgui.api import pefile as PeFile
-from dzgui.api.steam import get_last_updated
 
 from dzgui.config import query
 from dzgui.const.constants import (
@@ -341,10 +340,8 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
                 [LeftLabel(options.flatpak_label), self.flatpak_toggle],
             )
 
-        self.dayz_version_label = Gtk.Label(label=strings.null, halign=Gtk.Align.START)
+        self.dayz_version_label = Gtk.Label(label=strings.null)
-        self.dayz_exp_version_label = Gtk.Label(
+        self.dayz_exp_version_label = Gtk.Label(label=strings.null)
-            label=strings.null, halign=Gtk.Align.START
-        )
 
         version_rows = [
             [LeftLabel(APPNAME_DAYZ), self.dayz_version_label],
@@ -470,18 +467,10 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         dayz_version = PeFile.get_pretty_version(steam_path, APPID_DAYZ)
         if dayz_version is None:
             dayz_version = strings.null
-        else:
-            last_updated = get_last_updated(steam_path, APPID_DAYZ)
-            if last_updated is not None:
-                dayz_version += f" (updated at {last_updated})"
 
         dayz_exp_version = PeFile.get_pretty_version(steam_path, APPID_DAYZ_EXP)
         if dayz_exp_version is None:
             dayz_exp_version = strings.null
-        else:
-            last_updated = get_last_updated(steam_path, APPID_DAYZ_EXP)
-            if last_updated is not None:
-                dayz_exp_version += f" (updated at {last_updated})"
 
         self.dayz_version_label.set_text(dayz_version)
         self.dayz_exp_version_label.set_text(dayz_exp_version)

tests/fixtures/api/steamapps/appmanifest_444.acf

@@ -1,53 +0,0 @@
-"AppState"
-{
-	"appid"		"444"
-	"Universe"		"1"
-	"name"		"TEST APP"
-	"StateFlags"		"4"
-	"installdir"		"TESTAPP"
-	"LastUpdated"		"1792595373"
-	"LastPlayed"		"0"
-	"SizeOnDisk"		"0"
-	"StagingSize"		"0"
-	"buildid"		"0"
-	"LastOwner"		"0"
-	"DownloadType"		"2"
-	"UpdateResult"		"0"
-	"BytesToDownload"		"0"
-	"BytesDownloaded"		"0"
-	"BytesToStage"		"0"
-	"BytesStaged"		"0"
-	"TargetBuildID"		"0"
-	"AutoUpdateBehavior"		"0"
-	"AllowOtherDownloadsWhileRunning"		"0"
-	"ScheduledAutoUpdate"		"0"
-	"FullValidateAfterNextUpdate"		"1"
-	"InstalledDepots"
-	{
-		"3330"
-		{
-			"manifest"		"0"
-			"size"		"0"
-		}
-	}
-	"SharedDepots"
-	{
-		"228983"		"228980"
-		"228985"		"228980"
-		"228988"		"228980"
-		"228990"		"228980"
-		"229004"		"228980"
-	}
-	"UserConfig"
-	{
-		"language"		"english"
-		"platform_override_dest"		"linux"
-		"platform_override_source"		"windows"
-	}
-	"MountedConfig"
-	{
-		"language"		"english"
-		"platform_override_dest"		"linux"
-		"platform_override_source"		"windows"
-	}
-}

tests/fixtures/api/steamapps/appmanifest_555.acf

@@ -1,53 +0,0 @@
-"AppState"
-{
-	"appid"		"555"
-	"Universe"		"1"
-	"name"		"TEST APP"
-	"StateFlags"		"4"
-	"installdir"		"TESTAPP"
-	"LastUpdated"		"0"
-	"LastPlayed"		"0"
-	"SizeOnDisk"		"0"
-	"StagingSize"		"0"
-	"buildid"		"0"
-	"LastOwner"		"0"
-	"DownloadType"		"2"
-	"UpdateResult"		"0"
-	"BytesToDownload"		"0"
-	"BytesDownloaded"		"0"
-	"BytesToStage"		"0"
-	"BytesStaged"		"0"
-	"TargetBuildID"		"0"
-	"AutoUpdateBehavior"		"0"
-	"AllowOtherDownloadsWhileRunning"		"0"
-	"ScheduledAutoUpdate"		"0"
-	"FullValidateAfterNextUpdate"		"1"
-	"InstalledDepots"
-	{
-		"3330"
-		{
-			"manifest"		"0"
-			"size"		"0"
-		}
-	}
-	"SharedDepots"
-	{
-		"228983"		"228980"
-		"228985"		"228980"
-		"228988"		"228980"
-		"228990"		"228980"
-		"229004"		"228980"
-	}
-	"UserConfig"
-	{
-		"language"		"english"
-		"platform_override_dest"		"linux"
-		"platform_override_source"		"windows"
-	}
-	"MountedConfig"
-	{
-		"language"		"english"
-		"platform_override_dest"		"linux"
-		"platform_override_source"		"windows"
-	}
-}

tests/test_app_download_settings.py

@@ -3,7 +3,7 @@ import pytest
 from _pytest.monkeypatch import MonkeyPatch
 from pathlib import Path
 
-from dzgui.api.steam import get_app_allows_downloads, get_last_updated
+from dzgui.api.steam import get_app_allows_downloads
 from tests.fixtures import fixture_path
 
 pytestmark = pytest.mark.apitest
@@ -43,14 +43,6 @@ def patch_api() -> None:
     mp.undo()
 
 
-def test_no_last_update(steam_path) -> None:
-    assert get_last_updated(steam_path, 555) is None
-
-
-def test_last_update(steam_path) -> None:
-    assert get_last_updated(steam_path, 444) == "2026-10-22 00:09:33"
-
-
 def test_app_allows_downloads(steam_path) -> None:
     assert get_app_allows_downloads(steam_path, 111) is True
 

tests/test_config.py

@@ -36,7 +36,6 @@ def keys():
 
 # TODO: use a static fixture instead of system config
 @pytest.fixture
-@pytest.mark.realconfig
 def config():
     paths = get_xdg_paths()
     xdg = parse_filepaths(paths)