Merge pull request #509 from aclist/fix/marks-on-fixtures

fix: do not apply marks to fixtures

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

@@ -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)

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)

tests/test_flatpak_override.py

@@ -1,7 +1,7 @@
 import configparser
 import pytest
 
-from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID
+from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID, TMP_PATH
 from dzgui.config.xdg import get_xdg_paths
 from dzgui.util.flatpak import apply_overrides
 
@@ -38,6 +38,8 @@ def test_session_bus(override, config) -> None:
 
 
 def test_paths(override, xdg_paths, config) -> None:
-    expect = xdg_paths
+    expect: list[str] = []
+    expect.append(TMP_PATH)
+    expect.extend([*xdg_paths.values()])
     paths = config[PATHS_KEY][PATHS_SUBKEY].split(";")
-    assert all(str(path) in paths for path in expect.values())
+    assert all(str(path) in paths for path in expect)