chore: resolve pytest errors

fix: dword parse

dzgui/api/pefile.py

@@ -255,16 +255,28 @@ class PeFileError(Exception):
 
     pass
 
+
 def parse_version_number(data: BinaryIO) -> FileVersion:
     # https://learn.microsoft.com/en-us/windows/win32/api/verrsrc/ns-verrsrc-vs_fixedfileinfo
-    minor = struct.unpack("<L", data.read(4))[0] >> 16 & 0xFFFF
-    major = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    build = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    # NOTE: 0-pad revision number
-    revision = str(struct.unpack("<L", data.read(4))[0] >> 16 & 0xFFFF)
-    offset = 3 - len(revision)
-    padded = "0" * offset + revision
-    return FileVersion(major, minor, build, padded)
+    """
+    Note: structure differs from standard VS_FIXEDFILEINFO
+    Major: lower 16 bits of first DWORD
+    Minor: upper 16 bits of first DWORD
+    Build: lower 16 bits of third DWORD
+    Revision: upper 16 bits of second DWORD, zero-padded
+    Lower 16 bits of revision DWORD appear unused.
+    """
+    major_minor = struct.unpack("<I", data.read(4))[0]
+    revision_pair = struct.unpack("<I", data.read(4))[0]
+    build_dword = struct.unpack("<I", data.read(4))[0]
+
+    major = major_minor & 0xFFFF
+    minor = (major_minor >> 16) & 0xFFFF
+    build = build_dword & 0xFFFF
+    revision = (revision_pair >> 16) & 0xFFFF
+    revision = f"{revision:03d}"
+
+    return FileVersion(major, minor, build, revision)
 
 
 def seek_to_hex(address: str, data: BinaryIO) -> None:

dzgui/api/servers.py

@@ -346,7 +346,7 @@ def get_details(record: Record) -> Details | None:
                 dlc = strings.dlc_none
             case 2:
                 dlc = strings.dlc_frostline
-            case 3:
+            case 4:
                 dlc = strings.dlc_badlands
             case _:
                 dlc = strings.unspecified

dzgui/api/steam.py

@@ -245,9 +245,9 @@ def find_user_id(path: Path) -> str | None:
             last_user = str(next(iter(users)))
             if len(users) == 1:
                 return last_user
-            last_stamp = int(users[last_user]["Timestamp"])
+            last_stamp = int(users[last_user]["timestamp"])
             for user in users:
-                stamp = int(users[user]["Timestamp"])
+                stamp = int(users[user]["timestamp"])
                 if stamp > last_stamp:
                     last_stamp = stamp
                     last_user = user
@@ -265,12 +265,12 @@ def find_user_id_32(path: Path) -> int:
 
 
 class SteamAPIKeyError(Exception):
-    def __init__(self, msg=None):
+    def __init__(self, msg: str | None = None):
         super().__init__(msg or api_validation_error)
 
 
 class SteamWorkshopEndpointError(Exception):
-    def __init__(self, msg=None):
+    def __init__(self, msg: str | None = None):
         super().__init__(msg or workshop_endpoint_error)
 
 

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b26"
+version = "7.0.0b28"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"

tests/fixtures/api/loginusers_beta_client.vdf

@@ -8,6 +8,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 }

tests/fixtures/api/loginusers_beta_client_multiple.vdf

@@ -8,7 +8,7 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904411"
+		"timestamp"		"1787904411"
 	}
 	"1"
 	{
@@ -18,6 +18,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904647"
+		"timestamp"		"1787904647"
 	}
 }

tests/fixtures/api/loginusers_beta_client_multiple_2.vdf

@@ -8,7 +8,7 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1797904411"
+		"timestamp"		"1797904411"
 	}
 	"1"
 	{
@@ -18,6 +18,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904647"
+		"timestamp"		"1787904647"
 	}
 }

tests/fixtures/api/loginusers_legacy_client.vdf

@@ -9,6 +9,6 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"1"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 }

tests/fixtures/api/loginusers_legacy_client_multiple.vdf

@@ -9,7 +9,7 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"0"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 	"1"
 	{
@@ -20,6 +20,6 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"1"
-		"Timestamp"		"10"
+		"timestamp"		"10"
 	}
 }

tests/test_colorscheme.py

@@ -10,7 +10,7 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio, GLib  # noqa
 
 
-class TestWidget(ColorAwareApp, Gtk.Button):
+class DummyWidget(ColorAwareApp, Gtk.Button):
     def __init__(self) -> None:
         super().__init__()
 
@@ -22,11 +22,10 @@ class TestWidget(ColorAwareApp, Gtk.Button):
 
 
 @pytest.fixture
-def widget() -> TestWidget:
-    return TestWidget()
+def widget() -> DummyWidget:
+    return DummyWidget()
 
 
-@pytest.mark.integration
 @pytest.mark.parametrize("key, expect", [("default", False), ("prefer-dark", True)])
 def test_light_mode(widget, key: str, expect: bool) -> None:
     local_pref = subprocess.run(

tests/test_loginusers.py

@@ -3,6 +3,7 @@ import pytest
 from pathlib import Path
 
 from dzgui.api.steam import find_user_id
+from dzgui.const.constants import DEFAULT_STEAM_PATH
 from tests.fixtures import fixture_path
 
 pytestmark = pytest.mark.apitest
@@ -25,3 +26,11 @@ def test_loginusers(monkeypatch, fixture: str, expect: int) -> None:
     monkeypatch.setattr("dzgui.api.steam.find_loginusers", mock_loginusers)
     uid = find_user_id(Path(""))
     assert int(uid) == expect
+
+
+@pytest.mark.realconfig
+def test_live_loginusers() -> None:
+    """Added on 2026-10-17 following changes to VDF keys"""
+    steam = Path.home().joinpath(DEFAULT_STEAM_PATH)
+    uid = find_user_id(steam)
+    assert uid is not None