Merge 07cbf7a36a into 04e9e5dcf0

CHANGELOG.md

@@ -52,7 +52,6 @@
 - Filter button tooltips
 - Expand/collapse changelog versions
 - Support local light/dark mode changes on system theme
-- Server time calculator
 
 ### Changed
 - Conform to PEP 440 versioning for beta versions
@@ -91,7 +90,6 @@
 - Rare segfaults when changing maps (threading)
 - Moved dialogs out of threads
 - History table not being in lock-step with state file
-- Current keyword filter not being applied when refreshing table
 
 ### Unreleased
 - Load offline mods

README.md

@@ -1,23 +1,15 @@
 ## What this is
-DZGUI is a turnkey server browser and mod manager for DayZ on Linux. It allows you to connect to both official and modded/community DayZ servers on Linux via a graphical user interface (GUI).
+DZGUI is a turnkey browser and mod manager for DayZ on Linux. It allows you to connect to both official and modded/community DayZ servers on Linux via a graphical user interface (GUI).
 
 This overcomes certain limitations in the Linux client and helps prepare the game to launch by providing features like:
 
 - Search for and display global and LAN servers via an interactive table
 - Supports official, third-party, and modded DayZ servers
 - Automatically find and prepare mods being requested by servers
+- Add/delete/manage favorite servers by IP or ID
 - Quick-connect to favorite/recent servers
-- Manage and delete local mods
+- Manage local mods and symlinks
-- And more
+- Prepare launch options to pass to Steam
-
-## Design philosophy
-
-DZGUI follows a specific set of guidelines, enumerated below:
-
-- Provide a free and open-source tool under GPL
-- Do not use undocumented, third-party servers to aggregate data; no central "DZGUI" server
-- All connections go to Steam and DayZ servers directly; the tool should function in perpetuity without intermediary endpoints
-- Target Linux desktop and Steam Deck specifically; not a cross-platform tool
 
 ## Setup and usage
 
@@ -26,7 +18,7 @@ Please refer to the documentation for installation and setup instructions:
 - [GitHub](https://aclist.github.io/dzgui/index.html)
 - [Codeberg (Mirror)](https://aclist.codeberg.page)
 
-![A screenshot of DZGUI](/dzgui/data/images/example.png)
+![A screenshot of DZGUI](/images/example.png)
 
 ## Attribution
 
@@ -35,8 +27,6 @@ Geolocation records from [DB-IP](https://db-ip.com) under [CC 4.0 license](https
 Executable versions of DZGUI published as release binaries ship with various runtime dependencies and the Python interpreter built in.
 Users wishing to review the licenses to these components can inspect the `LICENSE` file located in the release tarball.
 
-Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.
-
 ## Disclaimer
 
 DZGUI is beta-quality software and is provided as-is.

dzgui/api/pefile.py

@@ -255,28 +255,16 @@ 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
-    Note: structure differs from standard VS_FIXEDFILEINFO
+    major = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    Major: lower 16 bits of first DWORD
+    build = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    Minor: upper 16 bits of first DWORD
+    # NOTE: 0-pad revision number
-    Build: lower 16 bits of third DWORD
+    revision = str(struct.unpack("<L", data.read(4))[0] >> 16 & 0xFFFF)
-    Revision: upper 16 bits of second DWORD, zero-padded
+    offset = 3 - len(revision)
-    Lower 16 bits of revision DWORD appear unused.
+    padded = "0" * offset + revision
-    """
+    return FileVersion(major, minor, build, padded)
-    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

@@ -54,16 +54,19 @@ class Res:
 
 @dataclass(slots=True, frozen=True)
 class Details:
-    data: list[list[str]]
+    data: Union[list, None]
-    name: str
     description: str
-    gametime: str
+    success: bool
-    day_accel: float
-    night_accel: float
 
 
-@dataclass(slots=True, frozen=True)
+@dataclass(slots=True)
 class Record:
+    # TODO: investigate whether this enum is still being used;
+    # can this be frozen?
+    """
+    The gameport field is manipulated by the RowType.CONN_BY_IP method
+    """
+
     ip: str
     gameport: int
     qport: int
@@ -280,41 +283,43 @@ def query_direct(ip: str, qport: int, timeout: float = 3.0) -> dict[str, Any] |
         info = a2s.info((ip, qport), timeout)
         return source_info_to_dict(ip, qport, info)
     except Exception as e:
-        logger.debug(e)
+        logger.warning(e)
         return None
 
 
-def get_details(record: Record) -> Details | None:
+def get_details(record: Record) -> Details:
+    # TODO: consolidate try/except statements
     ip = record.ip
     qport = record.qport
     default_str = strings.none_provided
 
     try:
         info = a2s.info((ip, qport))
+    except (TimeoutError, a2s.exceptions.BrokenMessageError):
+        return Details(None, default_str, False)
+    try:
         rules = dayzquery.dayz_rules((ip, qport))
+    except Exception:
+        return Details(None, default_str, False)
+
+    try:
         keywords = info.keywords.split(",")
-    except Exception as e:
+    except AttributeError:
-        logger.critical(e)
+        return Details(None, default_str, False)
-        return None
 
     battleye = strings.disabled
     if "battleye" in keywords:
         battleye = strings.enabled
 
-    name = info.server_name
+    day_accel = 0.0
-    day_accel = 1.0
+    night_accel = 0.0
-    night_accel = 1.0
-    gametime = "00:00"
     for keyword in keywords:
         if "etm" in keyword:
             day_accel = float(keyword.lstrip("etm"))
             day_accel = float(f"{day_accel:g}")
-        if "entm" in keyword:
+        if "entm" in keywords:
             night_accel = float(keyword.lstrip("entm"))
             night_accel = float(f"{night_accel:g}")
-        time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
-        if re.match(time_reg, keyword):
-            gametime = keyword
 
     try:
         password = info.password_protected
@@ -341,15 +346,10 @@ def get_details(record: Record) -> Details | None:
 
     try:
         dlc = rules.dlc_flags
-        match dlc:
+        if dlc == 0:
-            case 0:
+            dlc = strings.none
-                dlc = strings.dlc_none
+        if dlc == 2:
-            case 2:
             dlc = strings.dlc_frostline
-            case 4:
-                dlc = strings.dlc_badlands
-            case _:
-                dlc = strings.unspecified
     except AttributeError:
         dlc = strings.unspecified
 
@@ -380,7 +380,7 @@ def get_details(record: Record) -> Details | None:
         ["Version", version],
     ]
 
-    return Details(rows, name, description, gametime, day_accel, night_accel)
+    return Details(rows, description, True)
 
 
 def ping(ip: str, qport: int) -> int:

dzgui/api/shortcuts.py

@@ -11,7 +11,7 @@ from typing import Any
 
 from dzgui.api.steam import find_user_id_32
 from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, IMAGES_PATH
-from dzgui.util.dirs import copy_dzgui_to_xdg_data, make_parents
+from dzgui.util.dirs import copy_dzgui_to_xdg_data
 from dzgui.util.strings import unknown
 
 logger = logging.getLogger(APP_NAME)
@@ -75,8 +75,6 @@ class Shortcuts:
                 shortcuts = vdf.binary_load(f)
             self.shortcuts = shortcuts
             logger.debug("Loaded shortcuts file")
-        except FileNotFoundError:
-            self.shortcuts = {"shortcuts": {}}
         except Exception as e:
             logger.critical(e)
             raise e
@@ -111,7 +109,6 @@ class Shortcuts:
         for img in ("_hero", "p", "_logo"):
             filename = str(self.bpid) + img
             dest = grid_path.joinpath(filename).with_suffix(".png")
-            make_parents(dest)
             b = images.joinpath(img).with_suffix(".png").read_bytes()
             dest.write_bytes(b)
 
@@ -159,7 +156,6 @@ class Shortcuts:
         NEW_ENTRY["DevkitOverrideAppID"] = 0
         NEW_ENTRY["LastPlayTime"] = 0
         NEW_ENTRY["FlatpakAppID"] = ""
-
         NEW_ENTRY["sortas"] = ""
         NEW_ENTRY["tags"] = {}
         return NEW_ENTRY
@@ -173,13 +169,9 @@ class Shortcuts:
         self.save_shortcuts()
 
     def save_shortcuts(self) -> None:
-        if self.shortcuts_path.is_file():
         try:
             backup = self.shortcuts_path.with_suffix(".vdf.bak")
             shutil.copy(self.shortcuts_path, backup)
-            except Exception as e:
-                logger.critical(e)
-        try:
             with open(self.shortcuts_path, "wb") as f:
                 vdf.binary_dump(self.shortcuts, f)
         except Exception as e:

dzgui/api/steam.py

@@ -1,19 +1,16 @@
 import logging
 import os
 import psutil
-import re
 import requests
 import subprocess
 import vdf  # type: ignore
 
 from pathlib import Path
-from requests.exceptions import HTTPError
+from typing import Any, Union
-from typing import Any, Generator, Union
 from warnings import deprecated
 
 from dzgui.api.acf import ACF
-from dzgui.init.prereqs import has_any_client
+from dzgui.init.prereqs import has_steam_client
-from dzgui.init.prereqs import has_flatpak_client, has_steam_client
 from dzgui.const.constants import (
     APPID_DAYZ,
     APPID_DAYZ_EXP,
@@ -22,11 +19,10 @@ from dzgui.const.constants import (
     DAYZ_LAUNCHER,
     DEBIAN_STEAM_PATH,
     DEFAULT_STEAM_PATH,
-    DOWNLOADS_PATH,
     FLATPAK_STEAM_PATH,
     LIBRARYFOLDERS_PATH,
-    REQUEST_TIMEOUT,
     UBUNTU_STEAM_PATH,
+    REQUEST_TIMEOUT,
     VDF_PATH,
 )
 from dzgui.const.endpoints import (
@@ -36,7 +32,6 @@ from dzgui.const.endpoints import (
     UNSUB_ENDPOINT,
 )
 from dzgui.strings import wizard
-from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
 from dzgui.util.bash import concat_bash_args
 
 logger = logging.getLogger(APP_NAME)
@@ -62,7 +57,7 @@ class VDFLoadError(Exception):
 
 def get_steam_paths() -> list[tuple[Path, str]]:
     paths = []
-    if has_any_client():
+    if has_steam_client():
         HOME = Path.home()
         env = os.environ.get("XDG_DATA_HOME")
         if env is not None:
@@ -83,10 +78,6 @@ def get_steam_paths() -> list[tuple[Path, str]]:
         }
 
         for path in DEFAULT_PATH, FLATPAK_PATH, UBUNTU_PATH, DEBIAN_PATH:
-            if path is FLATPAK_PATH and has_flatpak_client() is False:
-                continue
-            if path is not FLATPAK_PATH and has_steam_client() is False:
-                continue
             if path.joinpath(VDF_PATH).is_file():
                 paths.append((path, human[path]))
     return paths
@@ -160,9 +151,7 @@ def get_remote_signatures(mods: list[str]) -> list[tuple[str, str, int, int]]:
     return hashes
 
 
-def connect_debug(
+def connect_debug(client: str, addr: str, appid: int, name: str, mods: list[str]) -> str:
-    client: str, addr: str, appid: int, name: str, mods: list[str]
-) -> str:
     concat = concat_mods(mods)
     client_args = concat_bash_args(client)
     params = [
@@ -178,7 +167,6 @@ def connect_debug(
     client_args.extend(params)
     return " ".join(client_args)
 
-
 # TODO: set config to name=user, use official server and no mods,
 # ensure that formatted string is identical to fixture with same hash
 def connect(client: str, addr: str, appid: int, name: str, mods: list[str]) -> int:
@@ -203,7 +191,6 @@ def load_to_menu(client: str, appid: int, name: str, mods: list[str]) -> int:
     """Loads to the menu screen with the selected mods; used for AFK/pre-joining"""
     concat = concat_mods(mods)
     client_args = concat_bash_args(client)
-    logger.debug(f"Setting client arguments to: {client_args}")
     params = [
         "-applaunch",
         str(appid),
@@ -248,18 +235,14 @@ def find_user_id(path: Path) -> str | None:
     try:
         with open(resolved_path, "r") as f:
             v = vdf.load(f)
-            users = v["users"]
+            # NOTE: beta client
-            # NOTE: beta client: /package/beta
+            # /package/beta
-            last_user = str(next(iter(users)))
+            if len(v["users"]) == 1:
-            if len(users) == 1:
+                return str(list(v["users"].keys())[0])
-                return last_user
+            for user in v["users"]:
-            last_stamp = int(users[last_user]["timestamp"])
+                if v["users"][user]["MostRecent"] == "1":
-            for user in users:
+                    return str(user)
-                stamp = int(users[user]["timestamp"])
+            return None
-                if stamp > last_stamp:
-                    last_stamp = stamp
-                    last_user = user
-            return last_user
     except Exception as e:
         logger.debug(e)
         return None
@@ -272,16 +255,6 @@ def find_user_id_32(path: Path) -> int:
     return int(uid) & 0xFFFFFFFF
 
 
-class SteamAPIKeyError(Exception):
-    def __init__(self, msg: str | None = None) -> None:
-        super().__init__(msg or api_validation_error)
-
-
-class SteamWorkshopEndpointError(Exception):
-    def __init__(self, msg: str | None = None) -> None:
-        super().__init__(msg or workshop_endpoint_error)
-
-
 def update_workshop(key: str, mod: int, endpoint: str) -> None:
     payload: dict[str, Union[int, str]] = {
         "publishedfileid": mod,
@@ -293,19 +266,8 @@ def update_workshop(key: str, mod: int, endpoint: str) -> None:
     try:
         res = requests.post(endpoint, params=payload, timeout=REQUEST_TIMEOUT)
         res.raise_for_status()
-    except HTTPError as e:
-        logger.critical(e)
-        match res.status_code:
-            case 403:
-                raise SteamAPIKeyError()
-            case 404:
-                raise SteamWorkshopEndpointError()
-            case _:
-                # TODO: apply redaction filter
-                raise e
     except Exception as e:
         logger.critical(e)
-        raise e
 
 
 def subscribe(key: str, mod: int) -> None:
@@ -447,22 +409,6 @@ def is_dayz_running() -> bool:
     return any(s in item for sublist in procs for item in sublist for s in substring)
 
 
-def get_pending_downloads(steam_path: Path, appid: int) -> Generator[Path, None, None]:
-    root_path = get_app_path(steam_path, appid)
-    downloads_dir = root_path / DOWNLOADS_PATH
-    files = downloads_dir.iterdir()
-    return files
-
-
-def is_dayz_downloading(steam_path: Path, appid: int) -> bool:
-    files = get_pending_downloads(steam_path, appid)
-    reg = re.compile(rf"^state_(?:{APPID_DAYZ_EXP}|{APPID_DAYZ})_.*\.patch$")
-    pending = [f for f in files if reg.match(f.name)]
-    if len(pending) > 0:
-        return True
-    return False
-
-
 def get_app_path(folders_path: Path, appid: int) -> Path:
     app_path = None
 

dzgui/app_init.py

@@ -1,18 +1,10 @@
 import logging
 import os
 import shutil
-
-from importlib import resources
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 
-from dzgui.const.constants import (
+from dzgui.const.constants import APP_NAME
-    APP_NAME,
-    APP_NAME_LOWER,
-    FLATPAK_ROOT_PATH,
-    ICONS_PATH,
-)
 from dzgui.const.enum import Preferences
 from dzgui.config.query import lookup
 from dzgui.config.userprefs import UserPrefs
@@ -23,7 +15,7 @@ from dzgui.init.migrate import (
     migrate_cols_file,
 )
 from dzgui.init.flock import lock_acquire
-from dzgui.init.prereqs import has_flatpak_client, has_steam_client
+from dzgui.init.prereqs import has_steam_client
 from dzgui.strings import boot
 
 from dzgui.util.deck import is_steam_deck, is_game_mode
@@ -104,23 +96,6 @@ def copy_bare_configs(config: "Path", resolution: "Path") -> tuple[bool, bool]:
     return (config_changed, state_changed)
 
 
-def load_steam_icon() -> None:
-    import gi
-
-    gi.require_version("Gtk", "3.0")
-    from gi.repository import Gtk  # noqa
-
-    try:
-        traversable = resources.files(APP_NAME_LOWER).joinpath(ICONS_PATH)
-        icons = Path(str(traversable))
-
-        theme = Gtk.IconTheme.get_default()
-        paths = theme.get_search_path()
-        theme.set_search_path(paths + [str(icons)])
-    except Exception as e:
-        logger.critical(e)
-
-
 def load_gui(version: str, is_debug: bool) -> None:
     lock = lock_acquire()  # noqa
 
@@ -148,7 +123,7 @@ def load_gui(version: str, is_debug: bool) -> None:
         migrate_cols_file(XDG.columns)
         copy_state_files(xdg_paths["XDG_STATE_HOME"])
         # TODO: add logging inside wizard
-        wizard = SetupWizard(_is_steam_deck, XDG, xdg_paths)
+        wizard = SetupWizard(_is_steam_deck, XDG)
 
         if not wizard.is_setup_complete():
             return
@@ -161,18 +136,13 @@ def load_gui(version: str, is_debug: bool) -> None:
         # TODO: sudo escalation dialog
         # count = get_map_count()
         # TODO: move into module
-        if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
+        if has_steam_client() is False:
-            has_client = has_flatpak_client()
-        else:
-            has_client = has_steam_client()
-        if has_client is False:
             EarlyAlertDialog(init.requires_steam)
 
     bootwin = BootWindow(XDG, version)
     local_coords, latest_release = bootwin.get_results()
 
     use_miles = lookup(XDG.config, Preferences.DIST)
-
     prefs = UserPrefs(
         is_steam_deck=_is_steam_deck,
         is_game_mode=_is_game_mode,
@@ -184,6 +154,5 @@ def load_gui(version: str, is_debug: bool) -> None:
         use_miles=use_miles,
     )
     print(boot.all_ok)
-    load_steam_icon()
     app = App(prefs)
     app.run(None)

dzgui/config/query.py

@@ -4,6 +4,8 @@ from pathlib import Path
 from dzgui.util._json import read_json
 
 from dzgui.const.enum import Preferences
+from dzgui.const.constants import STEAM_CMD, FLATPAK_RUN_CMD, FLATPAK_SANDBOX
+
 
 class ConfigFileError(Exception):
     pass
@@ -38,5 +40,23 @@ def get_favorites(path: Path) -> list[str]:
     return list(conf["ip_list"])
 
 
+# def is_in_favs(record: str, path: Path) -> bool:
+#    favs = get_favorites(path)
+#    if record in favs:
+#        return True
+#    return False
+
+
 def enum_to_key(enum: Preferences) -> str:
     return str(enum.dict["key"])
+
+
+def get_client_index(client: str) -> int:
+    if client == STEAM_CMD:
+        return 0
+    elif client == FLATPAK_RUN_CMD:
+        return 1
+    elif client == FLATPAK_SANDBOX:
+        return 2
+    else:
+        return 0

dzgui/config/xdg.py

@@ -3,13 +3,7 @@ import os
 from pathlib import Path
 from dataclasses import dataclass
 
-from dzgui.const.constants import (
+from dzgui.const.constants import APP_NAME_LOWER, DEBUG_LOG, SYSTEM_LOG
-    APP_NAME_LOWER,
-    DEBUG_LOG,
-    FLATPAK_ROOT_PATH,
-    SYSTEM_LOG,
-)
-from dzgui.init.proc import is_sandboxed
 
 
 @dataclass
@@ -59,12 +53,10 @@ def get_xdg_paths() -> dict:
         "XDG_DATA_HOME": home / ".local" / "share",
         "XDG_CACHE_HOME": home / ".cache",
     }
+
     resolved_paths = {}
     for path in xdg_paths:
         real_path = os.environ.get(path)
-        if real_path is not None and is_sandboxed():
-            search_string = FLATPAK_ROOT_PATH + "/"
-            real_path = real_path.replace(search_string, "")
         if real_path is not None and is_writeable(real_path):
             new_path = Path(real_path)
         else:

dzgui/const/constants.py

@@ -15,7 +15,6 @@ DAYZ_BINARY = "DayZ_x64.exe"
 DAYZ_LAUNCHER = "DayZLauncher.exe"
 
 LIBRARYFOLDERS_PATH = "steamapps/libraryfolders.vdf"
-DOWNLOADS_PATH = "steamapps/downloading"
 WORKSHOP_PATH = "steamapps/workshop/content/" + str(APPID_DAYZ)
 
 STEAM_CMD = "steam"
@@ -37,8 +36,7 @@ HEX_GREEN = "#32CD32"
 HEX_RED = "#FF0000"
 HEX_ORANGE = "#FFAC1C"
 
-# TODO: normalize icon names
+# FIXME: normalize icon names
-CALCULATOR = "accessories-calculator-symbolic"
 CARET_DOWN = "go-down-symbolic"
 CARET_UP = "go-up-symbolic"
 CLIPBOARD = "edit-copy-symbolic"
@@ -51,13 +49,11 @@ INPUT_KEYBOARD = "input-keyboard-symbolic"
 LIST_ADD = "list-add-symbolic"
 REFRESH_ICON = "view-refresh-symbolic"
 SEARCH_ICON = "system-search-symbolic"
-STEAM_ICON = "steam-tray-symbolic"
+STEAM_ICON = "steam_tray_mono"
 VIEW_CONCEAL = "view-conceal-symbolic"
 VIEW_REVEAL = "view-reveal-symbolic"
 WARNING = "dialog-warning-symbolic"
 WEB_BROWSER = "web-browser-symbolic"
-DAY_ICON = "weather-clear-symbolic"
-NIGHT_ICON = "weather-clear-night-symbolic"
 
 SEPARATOR = "SEPARATOR"
 
@@ -80,14 +76,12 @@ DEBUG_LOG = f"{APP_NAME}_DEBUG.LOG"
 SYSTEM_LOG = f"{APP_NAME}_SYSTEM.LOG"
 CHANGELOG_PATH = "data/CHANGELOG.md"
 IMAGES_PATH = "data/images"
-ICONS_PATH = "data/images/gtk"
 
 HERO_PATH = "data/images/_hero.png"
 CSS_PATH = "data/app.css"
 VDF_PATH = "steamapps/libraryfolders.vdf"
 DEFAULT_STEAM_PATH = ".local/share/Steam"
-FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
+FLATPAK_STEAM_PATH = ".var/app/com.valvesoftware.Steam/data/Steam"
-FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
 UBUNTU_STEAM_PATH = ".steam/steam"
 DEBIAN_STEAM_PATH = ".steam/debian-installation"
 
@@ -96,7 +90,6 @@ LOG_FILTERS = ("CRITICAL", "WARNING", "INFO", "DEBUG")
 TMP_PATH = "/tmp"
 TMP_TARBALL = "/tmp/dzgui.tar.gz"
 TMP_EXE = "/tmp/dzgui/dzgui"
-LOCK_FILE = "/tmp/dzgui.flock"
 
 DAYZ_COMMUNITY_ROOT = "Missions"
 

dzgui/controllers/emitter.py

@@ -111,10 +111,6 @@ class Emitter(GObject.GObject):
     def check_toggled(self, label: str, state: bool) -> None:
         pass
 
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=())
-    def servers_timed_out(self) -> None:
-        pass
-
     @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
     def servers_loaded(self, tag: "ServerTab") -> None:
         pass

dzgui/controllers/mc.py

@@ -7,12 +7,11 @@ import dzgui.util._json as JSON  # noqa
 
 
 from dzgui.const.enum import (
+    FilterMode,
+    Preferences,
+    NotebookPage,
     ButtonType,
     ContextMenu,
-    FilterMode,
-    NotebookPage,
-    Preferences,
-    ServerTab,
 )
 
 from dzgui.config.userprefs import UserPrefs
@@ -38,6 +37,7 @@ logger = logging.getLogger(APP_NAME)
 
 if TYPE_CHECKING:
     from dzgui.api.servers import Record
+    from dzgui.const.enum import ServerTab
     from dzgui.managers.connection import Prerequisites
     from dzgui.managers.filter import FilterManager
     from dzgui.util.dist import Haversine
@@ -498,9 +498,6 @@ class Controller(GObject.GObject):
 
     def set_active_keyword(self, keyword: str) -> None:
         self.get_filter_man().set_active_keyword(keyword)
-        ServerModelManager(self, self.get_active_treeview()).refilter(
-            FilterMode.TOGGLE_ON
-        )
 
     def get_modtreeview(self) -> "ModTreeView":
         return self.mediator.modtreeview
@@ -526,7 +523,6 @@ class Controller(GObject.GObject):
 
     def set_start_tab(self) -> None:
         ind = self.config_man.get_start_tab()
-        logger.info(f"Setting start tab to index {ind}")
         self.get_servers().notebook.set_current_page(ind)
 
     def get_debug_args(self) -> str:
@@ -541,10 +537,8 @@ class Controller(GObject.GObject):
     def update_status(self) -> None:
         self.mediator.preconnect.mark_finished()
 
-    def get_client_name(self) -> str:
+    def get_steam_client_name(self) -> str:
-        # NOTE: only possible values are "Steam" and "Flatpak"
+        return self.mediator.options.get_client_name()
-        cmd = self.query_config(Preferences.CLIENT)
-        return str(cmd.split()[0].capitalize())
 
     def present_window(self) -> None:
         self.mediator.window.present_with_time(Gdk.CURRENT_TIME)

dzgui/data/CHANGELOG.md

@@ -52,7 +52,6 @@
 - Filter button tooltips
 - Expand/collapse changelog versions
 - Support local light/dark mode changes on system theme
-- Server time calculator
 
 ### Changed
 - Conform to PEP 440 versioning for beta versions
@@ -91,7 +90,6 @@
 - Rare segfaults when changing maps (threading)
 - Moved dialogs out of threads
 - History table not being in lock-step with state file
-- Current keyword filter not being applied when refreshing table
 
 ### Unreleased
 - Load offline mods

dzgui/data/app.css

@@ -24,10 +24,6 @@
 .left-label {
     font-size: 1.3rem;
 }
-.server-subheading {
-    font-size: 1.1rem;
-    font-weight: 700;
-}
 .details-heading {
     font-size: 1.2rem
 }

dzgui/data/images/gtk/steam-tray-symbolic.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M568 320C568 457 456.8 568 319.6 568C205.8 568 110 491.7 80.6 387.6L175.8 426.9C182.2 459 210.7 483.3 244.7 483.3C283.9 483.3 316.6 450.9 314.9 409.8L399.4 349.6C451.5 350.9 495.2 308.7 495.2 256.1C495.2 204.5 453.2 162.6 401.5 162.6C349.8 162.6 307.8 204.6 307.8 256.1L307.8 257.3L248.6 343C233.1 342.1 217.9 346.4 205.1 355.1L72 300.1C82.2 172.4 189.1 72 319.6 72C456.8 72 568 183 568 320zM227.7 448.3L197.2 435.7C202.8 447.3 212.5 456.5 224.4 461.5C251.3 472.7 282.2 459.9 293.4 433.1C298.8 420.1 298.9 405.8 293.5 392.8C288.1 379.8 278 369.6 265 364.2C252.1 358.8 238.3 359 226.1 363.6L257.6 376.6C277.4 384.8 286.8 407.5 278.5 427.3C270.2 447.2 247.5 456.5 227.7 448.3zM401.5 193.8C435.9 193.8 463.8 221.7 463.8 256.1C463.8 290.5 435.9 318.4 401.5 318.4C367.1 318.4 339.2 290.5 339.2 256.1C339.2 221.7 367.1 193.8 401.5 193.8zM401.6 302.8C427.4 302.8 448.4 281.8 448.4 256C448.4 230.2 427.4 209.2 401.6 209.2C375.8 209.2 354.8 230.2 354.8 256C354.8 281.8 375.8 302.8 401.6 302.8z"/></svg>

dzgui/init/dayz.py

@@ -4,24 +4,17 @@ from pathlib import Path
 
 from dzgui.api.steam import get_app_path
 from dzgui.config.query import lookup
-from dzgui.const.constants import APPID_DAYZ, APP_NAME, APPNAME_DAYZ
+from dzgui.const.constants import APPID_DAYZ, APP_NAME
 from dzgui.const.enum import Preferences
 
-from dzgui.strings.preconnect import resync
-
 
 logger = logging.getLogger(APP_NAME)
 
 
-class VDFSyncError(Exception):
-    pass
-
-
 def is_dayz_installed(config: Path) -> None:
     try:
         path = lookup(config, Preferences.DEFAULT)
         get_app_path(Path(path), APPID_DAYZ)
     except Exception as e:
         logger.critical(e)
-        msg = resync.format(APPNAME_DAYZ)
+        raise e
-        raise VDFSyncError(msg)

dzgui/init/flock.py

@@ -5,9 +5,8 @@ import sys
 from pathlib import Path
 from typing import TextIO
 
-from dzgui.const.constants import LOCK_FILE
-from dzgui.util.strings import cannot_acquire_lock
 from dzgui.views.dialogs.early_alert import EarlyAlertDialog
+from dzgui.util.strings import cannot_acquire_lock
 
 
 def lock_release(lock: TextIO) -> None:
@@ -16,7 +15,7 @@ def lock_release(lock: TextIO) -> None:
 
 
 def lock_acquire() -> TextIO:
-    lockfile = Path(LOCK_FILE)
+    lockfile = Path("/tmp/dzgui.flock")
     lock = open(lockfile, "w")
     try:
         fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)

dzgui/init/prereqs.py

@@ -3,39 +3,23 @@ import shutil
 import subprocess
 
 from dzgui.const.constants import APP_NAME, FLATPAK_APPID, FLATPAK_CMD, STEAM_CMD
-from dzgui.init.proc import is_sandboxed
 
 logger = logging.getLogger(APP_NAME)
 
 
-def has_flatpak_client() -> bool:
-    if is_sandboxed():
-        return True
-    try:
-        res = subprocess.run(
-            [FLATPAK_CMD, "list", "--columns=application"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        if FLATPAK_APPID in res.stdout:
-            return True
-        else:
-            return False
-    except Exception as e:
-        logger.critical(e)
-        return False
-
-
 def has_steam_client() -> bool:
-    if shutil.which(STEAM_CMD):
-        return True
-    return False
-
-
-def has_any_client() -> bool:
     if shutil.which(STEAM_CMD):
         return True
     if not shutil.which(FLATPAK_CMD):
         return False
-    return has_flatpak_client()
+    try:
+        res = subprocess.run(
+            [FLATPAK_CMD, "list"], capture_output=True, text=True, check=True
+        )
+        if FLATPAK_APPID in res.stdout:
+            return True
+        else:
+            return False
+    except subprocess.CalledProcessError as e:
+        logger.critical(e)
+        return False

dzgui/init/proc.py

@@ -1,8 +1,7 @@
-import logging
-import os
 import psutil
-import shutil
 import subprocess
+import shutil
+import logging
 
 from dzgui.const.constants import (
     APP_NAME,
@@ -11,67 +10,42 @@ from dzgui.const.constants import (
     FLATPAK_CMD,
     FLATPAK_RUN_CMD,
     FLATPAK_SANDBOX,
-    FLATPAK_ROOT_PATH,
-    FLATPAK_STEAM_PATH,
 )
 
 logger = logging.getLogger(APP_NAME)
 
 
 def is_steam_running(cmd: str) -> bool:
-    if cmd in (FLATPAK_RUN_CMD, FLATPAK_SANDBOX):
+    if cmd == STEAM_CMD:
+        if has_cmd(STEAM_CMD) is False:
+            return False
+        return is_running(STEAM_CMD)
+    elif cmd == FLATPAK_RUN_CMD or FLATPAK_SANDBOX:
         return is_flatpak_steam_running()
-    elif cmd == STEAM_CMD:
-        return is_native_steam_running()
     else:
         raise TypeError("Not a valid Steam client selection")
 
 
-def is_sandboxed() -> bool:
+# CHORE: test alternate clients
-    return bool(os.environ.get("FLATPAK_ID"))
+# TODO: has_flatpak_steam
-
-
 def is_flatpak_steam_running() -> bool:
-    if is_sandboxed():
-        return True
     if has_cmd(FLATPAK_CMD) is False:
         return False
-    proc = subprocess.check_output(
+    proc = subprocess.check_output([FLATPAK_CMD, "ps"], text=True)
-        [FLATPAK_CMD, "ps", "--columns=application"], text=True
-    )
     lines = proc.splitlines()
     if FLATPAK_APPID in lines:
         return True
     return False
 
 
-def get_steam_procs() -> list[list[str]]:
+def is_running(proc: str) -> bool:
-    return [
+    for process in psutil.process_iter(["pid", "name"]):
-        p.cmdline()
+        if process.info["name"] == proc:
-        for p in psutil.process_iter(["pid", "name"])
+            return True
-        if STEAM_CMD in p.info["name"]
-    ]
-
-
-def is_native_steam_running() -> bool:
-    if has_cmd(STEAM_CMD) is False:
     return False
-    substrings = [FLATPAK_ROOT_PATH, "steam-runtime-launcher-service"]
-    steam_procs = get_steam_procs()
-    native_steam_procs = [
-        proc
-        for proc in steam_procs
-        if not any(sub in item for item in proc for sub in substrings)
-    ]
-    return bool(native_steam_procs)
 
 
 def has_cmd(cmd: str) -> bool:
     if shutil.which(cmd) is not None:
         return True
     return False
-
-
-def path_to_steam_cmd(path: str) -> str:
-    cmd = FLATPAK_RUN_CMD if FLATPAK_STEAM_PATH in path else STEAM_CMD
-    return cmd

dzgui/managers/config.py

@@ -6,6 +6,9 @@ from typing import Any, TYPE_CHECKING
 
 from dzgui.const.constants import (
     APP_NAME,
+    FLATPAK_RUN_CMD,
+    FLATPAK_SANDBOX,
+    STEAM_CMD,
     WINDOW_DEFAULT_X,
     WINDOW_DEFAULT_Y,
 )
@@ -126,6 +129,15 @@ class ConfigManager:
     def enum_to_key(self, enum: Preferences) -> str:
         return str(enum.dict["key"])
 
+    def get_client_index(self, client: str) -> int:
+        if client == STEAM_CMD:
+            return 0
+        if client == FLATPAK_RUN_CMD:
+            return 1
+        if client == FLATPAK_SANDBOX:
+            return 2
+        return 0
+
     def toggle_config(self, key: Preferences) -> None:
         try:
             real_key = self.enum_to_key(key)

dzgui/managers/connection.py

@@ -14,7 +14,6 @@ from dzgui.api.shortcuts import Shortcuts
 from dzgui.api.steam import (
     connect,
     connect_debug,
-    is_dayz_downloading,
     get_app_allows_downloads,
     get_app_name,
     get_needs_update,
@@ -49,7 +48,7 @@ from dzgui.strings.dialogs import (
 )
 from dzgui.strings import kb
 from dzgui.strings.server_mods import checkmark, resync
-from dzgui.util.format import format_exception, format_mib
+from dzgui.util.format import format_mib
 from dzgui.util.strings import dialog, server_timeout
 from dzgui.util.symlink import rebuild_symlinks
 from dzgui.views.dialogs.generic import ExceptionDialog
@@ -85,7 +84,6 @@ class Prerequisites:
     available_space: float
     passworded: bool
     dayz_running: bool
-    download_paused: bool
     steam_proc: SteamProcess
     mods: list[list[str]]
     game_mode: bool
@@ -171,7 +169,6 @@ class ConnectionManager:
                     free_mib = format_mib(free)
 
         dayz_running = is_dayz_running()
-        download_paused = is_dayz_downloading(steam_path, self.appid)
 
         running_app = get_running_app()
         if running_app is not None:
@@ -187,8 +184,8 @@ class ConnectionManager:
         else:
             allows_downloads = (True, "")
 
+        client_name = self.controller.get_steam_client_name()
         client = self.controller.query_config(Preferences.CLIENT)
-        client_name = self.controller.get_client_name()
         running = is_steam_running(client)
         steam_proc = SteamProcess(client_name, running)
         self.client = client
@@ -213,7 +210,6 @@ class ConnectionManager:
             available_space=free_mib,
             passworded=info.password_protected,
             dayz_running=dayz_running,
-            download_paused=download_paused,
             steam_proc=steam_proc,
             mods=remote_mods,
             game_mode=game_mode,
@@ -239,7 +235,7 @@ class ConnectionManager:
     @call_on_thread(dialog.querying)
     def query_details(self, record: Servers.Record) -> None:
         details = Servers.get_details(record)
-        if details is None:
+        if details.success is False:
             self.thread_man.set_cleanup_func(
                 StoredFunc(self._server_timeout), destroy_first=True
             )
@@ -304,11 +300,6 @@ class ConnectionManager:
         dialog = ServerDetailsDialog(self.controller, details)
         dialog.run()
 
-    def _workshop_timeout(self, msg: str) -> None:
-        dialog = ExceptionDialog(self.controller, msg)
-        dialog.show_all()
-        dialog.run()
-
     def _server_timeout(self) -> None:
         dialog = ExceptionDialog(self.controller, server_timeout)
         dialog.set_details_buffer(kb.DZG_006)
@@ -360,14 +351,8 @@ class ConnectionManager:
         for title, mod, stamp, size in self.missing_mods:
             if self.controller.is_cancel_pending():
                 return
-            try:
             subscribe(key, int(mod))
             time.sleep(API_RATE_LIMIT)
-            except Exception as e:
-                msg = format_exception(e)
-                func = StoredFunc(self._workshop_timeout, msg)
-                self.thread_man.set_cleanup_func(func, destroy_first=True)
-                return
 
         self.thread_man.update_dialog(waiting_for_directories)
         for title, mod, stamp, size in self.missing_mods:

dzgui/managers/filter.py

@@ -22,21 +22,20 @@ class FilterManager:
             strings.filter_night: True,
             strings.filter_full: show_full,
             strings.filter_official: True,
-            strings.filter_modded: True,
+            strings.filter_nonascii: False,
             strings.filter_lowpop: True,
             strings.filter_unofficial: True,
-            strings.filter_unmodded: True,
             strings.filter_duplicate: False,
-            strings.filter_nonascii: False,
+            strings.filter_modded: True,
         }
 
         # TODO: strings
         self.tooltips = {
             strings.filter_1pp: "First-person perspective",
-            strings.filter_day: "In-game time between 0600 and 1759",
+            strings.filter_day: "In-game time between 0700 and 1659",
             strings.filter_empty: "Servers with no players",
             strings.filter_3pp: "Third-person perspective",
-            strings.filter_night: "In-game time between 1800 and 0559",
+            strings.filter_night: "In-game time between 1700 and 0659",
             strings.filter_full: "Servers with no open slots",
             strings.filter_official: "Bohemia official servers",
             strings.filter_nonascii: "Server names using non-standard, complex glyphs",
@@ -44,7 +43,6 @@ class FilterManager:
             strings.filter_unofficial: "Third-party servers",
             strings.filter_duplicate: "Duplicates of existing servers (usually spoofed)",
             strings.filter_modded: "Servers with one or more mods",
-            strings.filter_unmodded: "Servers with no mods",
         }
 
         self.active_keyword = ""

dzgui/managers/mods.py

@@ -122,11 +122,7 @@ class ModManager:
     def unsub_atomic_mod(self, mod: str) -> None:
         config_man = self.controller.get_config_man()
         key = config_man.lookup(Preferences.STEAM)
-        try:
         unsubscribe(key, int(mod))
-        except Exception as e:
-            logger.critical(e)
-            return
 
         steam_path = Path(self.path)
         app_path = PeFile.get_nested_app_path(steam_path, APPID_DAYZ)

dzgui/model/proxy_model.py

@@ -12,8 +12,8 @@ if TYPE_CHECKING:
     from dzgui.api.servers import Record
     from dzgui.model.servers import NewPlayerCount
 
-DAY_REG = r"([0][6-9]|[1][0-7])"
+DAY_REG = r"([0][7-9]|[1][0-6])"
-NIGHT_REG = r"([0][0-5]|[1][8-9]|[2][0-3])"
+NIGHT_REG = r"([0][0-6]|[1][7-9]|[2][0-3])"
 
 
 class ProxyModelManager:
@@ -243,8 +243,6 @@ class ProxyModelManager:
                 rows = [row for row in rows if (row[4] / row[5] * 100) > 30]
             case strings.filter_modded:
                 rows = [row for row in rows if not row[11]]
-            case strings.filter_unmodded:
-                rows = [row for row in rows if row[11]]
         return rows
 
     def filter_toggle_on(self, filters: tuple[str]) -> list:
@@ -261,6 +259,10 @@ class ProxyModelManager:
     def set_cache(self, filters: tuple[str], filtered_rows: list[tuple]) -> None:
         self.filter_cache[filters] = filtered_rows
 
+    # @deprecated("Currently unused")
+    # def convert_model_to_list(self, model: "FastInsertListStore") -> list:
+    #    return [[el for el in row] for row in model]
+
     def set_filtered(self, rows: list | None) -> None:
         if rows is None:
             self.filtered = []
@@ -296,6 +298,4 @@ class ProxyModelManager:
     def push(self, data: list[Any]) -> None:
         self.wipe_cache()
         self.set_control(data)
-        cur_keyword = self.filter_man.get_active_keyword()
+        self.filter(FilterMode.INITIAL)
-        mode = FilterMode.TOGGLE_ON if len(cur_keyword) > 0 else FilterMode.INITIAL
-        self.filter(mode)

dzgui/model/servers.py

@@ -21,7 +21,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.api.servers import A2SInfo, Record
@@ -92,7 +92,6 @@ class ServerModelManager:
         job = Servers.query_api
         params = Servers.params
         servers = []
-
         with ThreadPoolExecutor() as executor:
             futures = [executor.submit(job, key, APPID_DAYZ, param) for param in params]
             for future in as_completed(futures):
@@ -391,8 +390,6 @@ class ServerModelManager:
     def _cleanup_on_success(self) -> None:
         proxy = self.proxy_man.get_proxy_model()
         self.tv.set_model(proxy)
-        if self.tv.enum == ServerTab.BROWSER:
-            GLib.idle_add(self.tv.wipe_cache)
         if self.preserve_on_fail is True:
             self.proxy_man.wipe_cache()
 
@@ -415,8 +412,6 @@ class ServerModelManager:
         # TODO: disable map, keyword, and filter widgets if model is None
         # signal driven (servers_empty, servers_failed_to_load)
 
-        self.emitter.emit("servers_timed_out")
-
         if self.preserve_on_fail is False:
             self.tv.set_model(None)
             filter_man = self.tv.get_filter_man()

dzgui/strings/calc.py

@@ -1,7 +0,0 @@
-heading_local_time = "Local time"
-heading_server_time = "In-game time"
-heading_target_time = "Target time"
-heading_remainder_time = "Remainder until target"
-heading_adjusted_time = "Adjusted local time"
-calculate = "Calculate"
-disclaimer = "Times shown are approximations.\nServer time may differ based on time of year in game."

dzgui/strings/connect_panel.py

@@ -1,18 +1,16 @@
-from dzgui.const.constants import UDP_PORT
-
 add_button="Add"
 add_con_heading="Add/connect"
 add_popover = "This address is already in your Saved Servers"
 add_tooltip="Add to Saved Servers"
 connect_button="Connect"
 connect_tooltip="Connect to this server"
-connect_entry_placeholder = f"Enter IP:Query port (e.g., 192.168.1.1:{UDP_PORT})"
+connect_entry_placeholder="Enter IP:Query port (e.g., 192.168.1.1:27016)"
 
 fav_heading="Favorite server"
 favs_empty="None set. Right click a server and select 'Set favorite' to set."
 
 lan_heading="LAN query port"
-lan_default_button = f"Default port ({UDP_PORT})"
+lan_default_button="Default port (27016)"
 lan_custom_button="Custom port"
 lan_scan_button="Scan"
 lan_abort_tooltip = "Unless you have multiple DayZ servers on your LAN,\nleave this checked to get results faster"

dzgui/strings/dialogs.py

@@ -23,8 +23,3 @@ custom_mod_dialog = "Set location to a custom mods folder"
 
 debug_heading = "Debug"
 debug_secondary = "Launch arguments"
-
-toggle_calc = "Toggle calculator"
-
-server_details = "Server details"
-server_message = "Server message"

dzgui/strings/errors.py

@@ -4,4 +4,3 @@ api_validation_error = (
 
 api_popover = "API key validation failed."
 dayz_not_found = "Could not find a valid DayZ installation."
-workshop_endpoint_error = "Steam Workshop service unavailable, try again later."

dzgui/strings/options.py

@@ -17,10 +17,3 @@ fullscreen_eventbox = "This option is not available on Steam Deck."
 save_button = "Save"
 
 api_failed = "API validation failed"
-
-flatpak_label = "Flatpak client"
-flatpak_standard = "Standard"
-flatpak_container = "Containerized (flatpak-spawn --host)"
-flatpak_info = (
-    "Containerized mode is used on certain distributions. May have side effects."
-)

dzgui/strings/preconnect.py

@@ -11,6 +11,8 @@ mods = "Mods"
 total_mods = "Total mods: "
 up_to_date = "All mods are up to date."
 all_updated = "All mods updated."
+"If you recently installed {build} or moved it to a different drive, "
+"restart Steam to allow these changes to synchronize, then try again."
 required_space = " Need to download {0} MiB of mod updates."
 
 placeholder_no_mods = "This server has no mods."
@@ -34,7 +36,6 @@ steam_not_running = "'{0}' is set as the default Steam client, but it is either
 use_desktop_mode = "Use Desktop Mode to download mods on Steam Deck."
 version_mismatch = "Local client version '{0}' does not match remote version '{1}'."
 version_missing = "Remote server is running the build '{0}', but it is not installed."
-no_errors = "No errors."
 
 
 # Warnings
@@ -47,7 +48,3 @@ running_app = (
     "Either stop the game first, or update your global Steam settings or the game's local settings.\n"
     "Otherwise, mods may be queued for download but never update."
 )
-downloads_paused = (
-    "It looks like DayZ may have a pending update on Steam that was paused.\n"
-    "To enqueue mods for download, unpause any pending DayZ update and allow it to complete."
-)

dzgui/strings/uninstall.py

@@ -30,8 +30,7 @@ path_remove_prefix = "The following path will be removed:"
 not_installed = "It looks like DZGUI was not previously set up; nothing to uninstall."
 standalone_uninstall = (
     "It looks like you are running the standalone version of DZGUI.\n"
-    "To finalize the uninstall process, invoke './dzgui self remove',\n"
+    "To finalize the uninstall process, you can remove the 'dzgui' file."
-    "then remove the 'dzgui' file."
 )
 system_uninstall = (
     "It looks like DZGUI was installed via your system package manager or directly from source code.\n"

dzgui/strings/wizard.py

@@ -3,8 +3,6 @@ title_intro = "Welcome"
 blurb_intro = """
 This wizard will help you set up some common config options before launching the application.
 """
-error_sandbox = "Setup cannot be run from inside Flatpak sandbox.\nPlease launch the application directly."
-welcome = "Welcome to {0}!"
 
 ### SteamPathPage
 heading_steam_path = "Steam path"
@@ -19,7 +17,7 @@ desc_flatpak_path = (
 desc_ubuntu_path = "This is the default Steam path on <b>Ubuntu-based systems</b>."
 desc_debian_path = "This is the default Steam path on <b>Debian-based systems</b>."
 no_valid_paths = (
-    "No valid Steam path or Steam command found on system. Please install Steam to continue."
+    "No valid Steam paths found on system. Please install Steam to continue."
 )
 button_scan = "Scan for Steam"
 
@@ -73,7 +71,6 @@ checkbox_steam_shortcut = (
         "This creates a standalone copy of DZGUI and adds it to Steam. "
         "You <b>must restart Steam</b> for the shortcut to appear. This will not replace or update existing shortcuts. "
         "If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version."
-        "Not available if you selected the Flatpak client as your Steam default."
     ),
 )
 checkbox_start_menu = (
@@ -82,17 +79,6 @@ checkbox_start_menu = (
 )
 checkbox_desktop_shortcut = ("Add a desktop shortcut", "Depends on the option above.")
 
-### Flatpak page
-heading_flatpak = "Flatpak sandbox overrides"
-blurb_flatpak = (
-    "You chose to add a shortcut directly to Flatpak Steam. "
-    "To launch DZGUI from Flatpak's sandbox, you must grant "
-    "permission to read from and write to the following locations."
-)
-tree_column = "Paths"
-overrides_applied = "Overrides applied."
-button_flatpak = "Grant permissions"
-
 ### Completion page
 heading_completion = "Setup complete"
 blurb_completion = "Configuration completed successfully. Click 'Close' to close this dialog and launch DZGUI."

dzgui/util/bash.py

@@ -1,12 +1,5 @@
 import shlex
 
-from dzgui.const.constants import STEAM_CMD
-from dzgui.init.proc import is_sandboxed
-
 
 def concat_bash_args(command: str) -> list[str]:
-    # NOTE: NSGs spawned from sandbox cannot access host application commands,
-    # so fallback to Steam internal URIs
-    if is_sandboxed():
-        return [STEAM_CMD]
     return shlex.split(command)

dzgui/util/dist.py

@@ -84,5 +84,6 @@ class CalcDist:
         except Exception:
             return None
 
+        # TODO: handle failed remote dist
         haversine = Haversine(local.lat, local.lon, remote.lat, remote.lon)
         return haversine

dzgui/util/flatpak.py

@@ -1,35 +0,0 @@
-import logging
-import subprocess
-
-from dzgui.const.constants import APP_NAME, FLATPAK_APPID, GTK_APP_ID, TMP_PATH
-
-logger = logging.getLogger(APP_NAME)
-
-
-def apply_overrides(xdg: dict[str, str]) -> None:
-    try:
-        # NOTE: D-Bus registration required for sandbox
-        args = [
-            "flatpak",
-            "--user",
-            "override",
-            f"--own-name={GTK_APP_ID}",
-            FLATPAK_APPID,
-        ]
-        subprocess.run([*args], capture_output=True)
-
-        paths: list[str] = []
-        paths.extend([*xdg.values()])
-        paths.append(TMP_PATH)
-
-        for path in paths:
-            args = [
-                "flatpak",
-                "--user",
-                "override",
-                f"--filesystem={path}",
-                FLATPAK_APPID,
-            ]
-            subprocess.run([*args], capture_output=True)
-    except Exception as e:
-        logger.critical(e)

dzgui/util/ip.py

@@ -2,13 +2,14 @@ import a2s
 import requests
 import shutil
 import subprocess
+from warnings import deprecated
 
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from dzgui.api.servers import Record
 from dzgui.const.constants import REQUEST_TIMEOUT
-from dzgui.const.endpoints import IP_ECHO
+from dzgui.const.endpoints import COORDS_API, IP_ECHO
 
 
 if TYPE_CHECKING:
@@ -126,3 +127,10 @@ def is_valid_port(port: str) -> bool:
     if not port.isdigit() or int(port) == 0 or int(port[0]) == 0 or int(port) > 65535:
         return True
     return False
+
+
+@deprecated("use ips.csv")
+def get_local_coords(ip: str) -> str:
+    url = COORDS_API + "/" + ip
+    # local res=$(curl -Ls "$url" | jq -r '"\(.lat)\n\(.lon)"')
+    return url

dzgui/util/strings.py

@@ -11,6 +11,7 @@ delimiter = "␞"
 # GenericDialog
 main_menu = "Return to main menu"
 exit_app = "Exit"
+server_details = "Server details"
 modlist = "Modlist"
 input_required = "User input required"
 confirm = "Confirmation"
@@ -58,6 +59,7 @@ browser_cols = [
 ]
 
 # DetailsDialog
+server_message = "Server message"
 workshop = "Enter/double click a row to open in Steam Workshop."
 
 # LanDialog
@@ -156,7 +158,6 @@ filter_duplicate = "Duplicate"
 filter_official = "Official"
 filter_unofficial = "Unofficial"
 filter_modded = "Modded"
-filter_unmodded = "Unmodded"
 
 # maps
 all_maps = "All maps"
@@ -167,12 +168,11 @@ none_provided = "None provided"
 disabled = "Disabled"
 enabled = "Enabled"
 null = "-"
+none = "None"
 unspecified = "not specified"
 
 # DLC
 dlc_frostline = "Frostline"
-dlc_badlands = "Badlands"
-dlc_none = "None"
 
 # platform
 windows = "Windows"
@@ -297,7 +297,7 @@ class Options:
 init = Init(
     is_steam_running="Is Steam running? DZGUI must be run on top of Steam.",
     is_dayz_running="Is DayZ already running? DZGUI cannot launch DayZ if another process is using it.",
-    requires_steam="Your chosen client (Steam/Flatpak Steam) must be installed on the system.",
+    requires_steam="DZGUI requires that Steam or Flatpak Steam be installed on the system.",
 )
 
 mod_panel = ModPanelStrings(

dzgui/util/symlink.py

@@ -2,12 +2,7 @@ import logging
 from pathlib import Path
 
 from dzgui.api.mods import get_local_mod_path, get_local_mod_ids, _hash
-from dzgui.const.constants import (
+from dzgui.const.constants import APPID_DAYZ, APPID_DAYZ_EXP, APP_NAME, DAYZ_COMMUNITY_ROOT
-    APPID_DAYZ,
-    APPID_DAYZ_EXP,
-    APP_NAME,
-    DAYZ_COMMUNITY_ROOT,
-)
 from dzgui.const.enum import Preferences
 from dzgui.config.query import lookup
 
@@ -25,7 +20,6 @@ def expunge_link(file: Path) -> None:
     if str(file.stem)[:2] == "@C":
         file.unlink()
 
-
 def rebuild_symlinks(config: Path) -> None:
     # TODO: pass direct path as argument
     path = lookup(config, Preferences.DEFAULT)
@@ -69,9 +63,10 @@ def symlink_mission(steam_path: Path, target: str) -> str:
     stem = path.name
     parent = path.parent
     source = dayz_path.joinpath(DAYZ_COMMUNITY_ROOT)
-    if source.exists():
+    try:
-        source.unlink()
         source.symlink_to(parent)
+    except Exception:
+        return ""
     return f"{DAYZ_COMMUNITY_ROOT}/{stem}"
 
 

dzgui/views/base.py

@@ -1,5 +1,6 @@
 import logging
 import signal
+import warnings
 
 from typing import TYPE_CHECKING, Literal, Self
 
@@ -7,11 +8,12 @@ from dzgui.const.constants import (
     APP_NAME,
     APP_NAME_LOWER,
     GTK_APP_ID,
+    STEAM_ICON,
 )
 from dzgui.const.enum import NotebookPage
 from dzgui.controllers.emitter import Emitter
 from dzgui.controllers.mc import Controller
-from dzgui.util import css
+from dzgui.util import css, strings
 from dzgui.util.keys import is_ctrl_mask
 from dzgui.views.components.connect_panel import ConnectPanel
 from dzgui.views.components.crumbs import Breadcrumbs
@@ -45,6 +47,10 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(APP_NAME)
 
+# TODO: drop
+# https://bugzilla.gnome.org/show_bug.cgi?id=708676
+warnings.filterwarnings("ignore", ".*g_value_get_int", Warning)
+
 
 class OuterWindow(Gtk.ApplicationWindow):
     def __init__(self, app: Gtk.Application) -> None:
@@ -331,4 +337,15 @@ class App(ColorAwareApp, Gtk.Application):  # type: ignore
     ) -> None:
         self.win.halt_proc_and_quit()
 
+
 MainController = Controller()
+
+try:
+    theme = Gtk.IconTheme.get_default()
+    icons = theme.list_icons(None)
+    if STEAM_ICON not in icons:
+        logger.warn(strings.steam_icon_missing)
+        warnings.warn(strings.steam_icon_missing, stacklevel=2)
+except Exception as e:
+    logger.warning(e)
+    warnings.warn(strings.gtk_theme_missing, stacklevel=2)

dzgui/views/components/box.py

@@ -24,7 +24,6 @@ class VBox(GenericBox):
     def __init__(self, spacing: int = 0) -> None:
         super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=spacing)
 
-
 class ShortHBox(HBox):
     def __init__(self, widget: Gtk.Widget) -> None:
         super().__init__(spacing=5)

dzgui/views/components/buttons.py

@@ -65,7 +65,6 @@ class IconButton(Gtk.Button):
         self.set_image(self.icon)
         self.set_image_position(position)
         self.set_focus_on_click(False)
-        self.set_always_show_image(True)
 
     def swap_icon(self, icon: str) -> None:
         start = self.icon.get_margin_start()
@@ -163,24 +162,18 @@ class RefreshButton(IconTextButton):
         self.set_tooltip_text(atomic_buttons.refresh_tooltip)
 
         self.connect("clicked", self._on_refresh_clicked)
-        emitter.connect("servers_loaded", self._on_load)
+        emitter.connect("servers_loaded", self.start_decrement)
-        emitter.connect("servers_timed_out", self._on_timeout)
-
-    def _on_timeout(self, emitter: "Emitter") -> None:
-        self.is_clicked = True
-        self.start_decrement()
-
-    def _on_load(self, emitter: "Emitter", tab: "ServerTab") -> None:
-        self.start_decrement()
 
     def _on_refresh_clicked(self, button: Self) -> None:
         """Spawned in a thread"""
+        if self.controller.get_active_treeview().is_loaded() is False:
+            return
         self.is_clicked = True
         self.controller.refresh_tree()
         # TODO: get server tab enum
         # if LAN tab, reload existing entries in place
 
-    def start_decrement(self) -> None:
+    def start_decrement(self, emitter: "Emitter", tab: "ServerTab") -> None:
         if self.is_clicked is False:
             return
         if self.loading:

dzgui/views/components/filter_panel.py

@@ -9,6 +9,8 @@ from dzgui.const.constants import (
     NO_PADDING,
     SEARCH_ICON,
 )
+from dzgui.const.enum import FilterMode
+from dzgui.model.servers import ServerModelManager
 from dzgui.util.format import format_exception
 from dzgui.util.strings import all_maps
 from dzgui.views.components.maps_combo import MapsCombo
@@ -146,6 +148,10 @@ class KeywordEntry(Gtk.Entry):
         self.controller.set_active_keyword(keyword)
         logger.info(f"User filtered by keyword '{keyword}'")
 
+        ServerModelManager(
+            self.controller, self.controller.get_active_treeview()
+        ).refilter(FilterMode.TOGGLE_ON)
+
 
 class FilterPanel(Gtk.Box):
     def __init__(self, controller: "Controller") -> None:

dzgui/views/components/icon.py

@@ -9,6 +9,3 @@ class Icon(Gtk.Image):
         super().__init__(
             icon_name=name, icon_size=Gtk.IconSize.BUTTON, margin_start=l_margin
         )
-
-    def set_icon_name(self, name: str) -> None:
-        super().set_from_icon_name(name, Gtk.IconSize.BUTTON)

dzgui/views/components/misc.py

@@ -1,72 +1,42 @@
-from typing import Self
-from warnings import deprecated
-
 from dzgui.const.constants import ERROR, FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
-from dzgui.init.prereqs import has_steam_client, has_flatpak_client
 from dzgui.strings import options
 from dzgui.views.components.box import HBox
 from dzgui.views.components.buttons import Icon
 
+
 import gi
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk  # noqa
 
 
-@deprecated("Client choice is determined at setup time")
 class ClientCombo(Gtk.ComboBox):
     def __init__(self) -> None:
         super().__init__()
 
-        has_steam = has_steam_client()
+        self.client_store = Gtk.ListStore(str, str)
-        has_flatpak = has_flatpak_client()
+        clients = (
-        self.client_store = Gtk.ListStore(str, str, bool)
-        self.clients = (
             (
                 options.steam_combo,
                 STEAM_CMD,
-                has_steam,
             ),
             (
                 options.flatpak_combo,
                 FLATPAK_RUN_CMD,
-                has_flatpak,
             ),
             (
                 options.flatpak_container_combo,
                 FLATPAK_SANDBOX,
-                has_flatpak,
             ),
         )
-        for client in self.clients:
+        for client in clients:
             self.client_store.append(client)
-
         self.set_model(self.client_store)
         renderer_text = Gtk.CellRendererText()
         self.pack_start(renderer_text, True)
         self.add_attribute(renderer_text, "text", 0)
         self.set_active(0)
 
-        self.set_cell_data_func(self.get_cells()[0], self.data_func)
-
-    def data_func(
-        self,
-        combo: Self,
-        cell: Gtk.CellRendererText,
-        model: Gtk.ListStore,
-        _iter: Gtk.TreeIter,
-    ) -> None:
-        sens = model[_iter][2]
-        cell.set_property("sensitive", sens)
-
-    def get_client_human_readable(self, cmd: str) -> str:
-        for client in self.clients:
-            human, command, sens = client
-            if command == cmd:
-                return human
-        raise TypeError("Not a valid Steam client selection")
-
-
 class ErrorPopover(Gtk.Popover):
     def __init__(self, relative_to: Gtk.Widget, position: Gtk.PositionType) -> None:
         super().__init__(relative_to=relative_to, position=position)

dzgui/views/dialogs/boot.py

@@ -102,7 +102,7 @@ class BootDialog(ColorAwareApp, Gtk.Dialog):  # type: ignore
             margin_top=30,
             margin_bottom=30,
         )
-        self.error_label = Gtk.Label(margin_start=15, margin_end=15)
+        self.error_label = Gtk.Label()
 
         # TODO: abstract class
         self.copy_button = ClipboardButton(None, lambda: self.error_label.get_text())

dzgui/views/dialogs/calc.py

@@ -1,457 +0,0 @@
-import gi
-from dataclasses import dataclass
-from datetime import datetime, time, timedelta
-from typing import Literal
-
-from dzgui.const.constants import DAY_ICON, NIGHT_ICON
-from dzgui.strings import calc
-from dzgui.views.components.icon import Icon
-from dzgui.views.components.labels import BoldLabel
-from dzgui.views.components.box import VBox, HBox
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, GObject  # type: ignore  # noqa E402
-
-DAY_START_TIME = time(hour=6, minute=0, second=0)
-DAY_END_TIME = time(hour=18, minute=0, second=0)
-NIGHT_START_TIME = time(hour=18, minute=0, second=0)
-NIGHT_END_TIME = time(hour=6, minute=0, second=0)
-EXTENDED_TIME_FORMAT = "%H:%M:%S"
-
-
-@dataclass(slots=True, frozen=True)
-class Time:
-    time: str
-    day_accel: float
-    night_accel: float
-
-
-class Emitter(GObject.GObject):
-    def __init__(self) -> None:
-        super().__init__()
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object, object))
-    def local_time_incremented(self, time_now: datetime, elapsed: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def server_time_incremented(self, server_time: datetime) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=())
-    def calculate_button_clicked(self) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def target_time_changed(self, time: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def target_time_reset(self, time: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def remaining_time_changed(self, time: datetime) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def adjusted_local_time_changed(self, time: datetime) -> None:
-        pass
-
-
-class LocalClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.start_time = datetime.now()
-        # NOTE: highest theoretical accel interval is 24 * 64
-        GLib.timeout_add(500, self.check_time)
-
-    def get_time(self) -> str:
-        return datetime.now().time().strftime(EXTENDED_TIME_FORMAT)
-
-    def get_elapsed_time(self) -> timedelta:
-        return datetime.now() - self.start_time
-
-    def check_time(self) -> Literal[True]:
-        time_now = datetime.now()
-        elapsed = datetime.now() - self.start_time
-        self.emitter.emit("local_time_incremented", time_now, elapsed)
-        return True
-
-
-class ServerClock:
-    def __init__(
-        self, server_time: Time, emitter: Emitter, local_clock: LocalClock
-    ) -> None:
-
-        self.local_clock = local_clock
-        self.emitter = emitter
-
-        hour, minute = self.split_time(server_time)
-        self.day_accel = server_time.day_accel
-        self.night_accel = server_time.night_accel
-
-        self.start_time = datetime.combine(datetime.today(), time(hour, minute))
-        self.cur_time = datetime.combine(datetime.today(), time(hour, minute))
-
-        self._last_elapsed = self.local_clock.get_elapsed_time()
-        self.emitter.connect("local_time_incremented", self._on_local_time_incremented)
-
-    @staticmethod
-    def split_time(server_time: Time) -> tuple[int, int]:
-        split = server_time.time.split(":")
-        return int(split[0]), int(split[1])
-
-    def is_day(self) -> bool:
-        if DAY_START_TIME <= self.cur_time.time() <= DAY_END_TIME:
-            return True
-        return False
-
-    def _on_local_time_incremented(
-        self,
-        emitter: Emitter,
-        time: datetime,
-        elapsed: timedelta,
-    ) -> Literal[True]:
-        delta = elapsed - self._last_elapsed
-        self._last_elapsed = elapsed
-        factor = self.get_accel_factor(self.cur_time)
-        self.cur_time += delta * factor
-        self.emitter.emit("server_time_incremented", self.cur_time)
-        return True
-
-    def get_accel_factor(self, dt: datetime) -> float:
-        return (
-            self.day_accel
-            if DAY_START_TIME <= dt.time() < DAY_END_TIME
-            else (self.night_accel * self.day_accel)
-        )
-
-    def get_values(self) -> tuple[int, int]:
-        return self.cur_time.hour, self.cur_time.minute
-
-    def get_datetime(self) -> datetime:
-        return self.cur_time
-
-    def get_time(self) -> time:
-        return self.cur_time.time()
-
-    def calc_delta(self, end_time: datetime) -> timedelta:
-        total = 0.0
-        current_time = self.cur_time
-
-        if current_time > end_time:
-            end_time += timedelta(days=1)
-
-        while current_time < end_time:
-            factor = self.get_accel_factor(current_time)
-            day_start = datetime.combine(current_time.date(), DAY_START_TIME)
-            day_end = datetime.combine(current_time.date(), DAY_END_TIME)
-
-            if current_time.time() < DAY_START_TIME:
-                edge = day_start
-            elif current_time.time() < DAY_END_TIME:
-                edge = day_end
-            else:
-                edge = datetime.combine(
-                    current_time.date() + timedelta(days=1), DAY_START_TIME
-                )
-
-            chunk_end = min(end_time, edge)
-            total += (chunk_end - current_time).total_seconds() / factor
-            current_time = chunk_end
-        return timedelta(seconds=total)
-
-
-class RemainderClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.emitter.connect("target_time_changed", self._on_target_time_changed)
-        self.emitter.connect("target_time_reset", self._on_target_time_reset)
-        self.emitter.connect("local_time_incremented", self._on_local_time_incremented)
-        self.reset_time(True)
-
-        self.previous = timedelta(0)
-
-    def reset_time(self, zero_out: bool = False) -> None:
-        now = datetime.now()
-        second, ms = (0, 0) if zero_out else (now.second, now.microsecond)
-        self.time = datetime.combine(
-            now, time(hour=0, minute=0, second=second, microsecond=ms)
-        )
-
-    def _on_local_time_incremented(
-        self, emitter: Emitter, time: datetime, elapsed: timedelta
-    ) -> None:
-        if self.time == datetime.min.time():
-            return
-
-        delta = elapsed - self.previous
-        # NOTE: clamp to midnight
-        self.time = max(
-            self.time - delta, self.time.replace(hour=0, minute=0, second=0)
-        )
-        self.previous = elapsed
-        self.emitter.emit("remaining_time_changed", self.time)
-
-    def _on_target_time_reset(self, emitter: Emitter, time: timedelta) -> None:
-        self.reset_time(True)
-        self.emitter.emit("remaining_time_changed", self.time)
-        # NOTE: restore adjusted time to current time
-        self.emitter.emit("adjusted_local_time_changed", datetime.now())
-
-    def _on_target_time_changed(self, emitter: Emitter, time: timedelta) -> None:
-        self.reset_time(True)
-        self.time += time
-        self.emitter.emit("remaining_time_changed", self.time)
-
-    def get_time(self) -> str:
-        return self.time.strftime(EXTENDED_TIME_FORMAT)
-
-
-class AdjustedClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.emitter.connect("target_time_changed", self._on_target_time_changed)
-        self.start_time = datetime.now()
-
-    def _on_target_time_changed(self, emitter: Emitter, time: timedelta) -> None:
-        self.start_time = datetime.now()
-        adjusted = self.start_time + time
-        self.emitter.emit("adjusted_local_time_changed", adjusted)
-
-    def get_time(self) -> str:
-        return self.start_time.strftime(EXTENDED_TIME_FORMAT)
-
-
-class VerticalSpinBox(Gtk.SpinButton):
-    def __init__(self, value: int, upper: int) -> None:
-        super().__init__(
-            adjustment=Gtk.Adjustment(
-                value=value,
-                lower=0,
-                upper=upper,
-                step_increment=1,
-                page_increment=1,
-                page_size=0,
-            ),
-            orientation=Gtk.Orientation.VERTICAL,
-        )
-
-
-class HourSpinBox(VerticalSpinBox):
-    def __init__(self, hour: int) -> None:
-        super().__init__(value=hour, upper=23)
-
-
-class MinuteSpinBox(VerticalSpinBox):
-    def __init__(self, minute: int) -> None:
-        super().__init__(value=minute, upper=59)
-
-        self.get_adjustment().set_page_increment(10)
-
-
-class TimePicker(Gtk.Box):
-    def __init__(self, hour: int, minute: int) -> None:
-        super().__init__(
-            orientation=Gtk.Orientation.HORIZONTAL,
-            halign=Gtk.Align.CENTER,
-            valign=Gtk.Align.CENTER,
-        )
-        self.hour_spin = HourSpinBox(hour)
-        self.minute_spin = MinuteSpinBox(minute)
-        self.add(self.hour_spin)
-        self.add(self.minute_spin)
-
-        self.hour_spin.connect("output", self._on_output)
-        self.minute_spin.connect("output", self._on_output)
-
-    def _on_output(self, spin_button: VerticalSpinBox) -> Literal[True]:
-        val = spin_button.get_value()
-        spin_button.set_text(f"{int(val):02d}")
-        # NOTE: indicates that rendering completed
-        return True
-
-    def get_values(self) -> tuple[int, int]:
-        hour = self.get_hour()
-        minute = self.get_minute()
-        return hour, minute
-
-    def get_hour(self) -> int:
-        return int(self.hour_spin.get_adjustment().get_value())
-
-    def get_minute(self) -> int:
-        return int(self.minute_spin.get_adjustment().get_value())
-
-    def get_time(self) -> datetime:
-        """
-        NOTE: interpolating seconds/microseconds from the current time
-        may prevent abrupt visual changes when setting a new TimePicker time
-        while a clock tick is updating the local remainder label.
-        However, this can introduce false negatives when running tests due to microsecond drift.
-        Ideally, tests should be decoupled from this logic.
-        """
-        d = datetime.now()
-        return datetime.combine(
-            d,
-            time(
-                hour=self.get_hour(),
-                minute=self.get_minute(),
-                second=0,
-                microsecond=0,
-            ),
-        )
-
-    def set_time(self, hour: int, minute: int) -> None:
-        self.hour_spin.get_adjustment().set_value(hour)
-        self.minute_spin.get_adjustment().set_value(minute)
-
-
-class AdjustedTimeFrame(Gtk.Frame):
-    def __init__(self, emitter: Emitter) -> None:
-        super().__init__(margin_start=50, margin_end=50)
-
-        self.emitter = emitter
-        self.emitter.connect(
-            "adjusted_local_time_changed", self._on_adjusted_time_changed
-        )
-        self.emitter.connect("remaining_time_changed", self._on_remainder_changed)
-
-        self.remainder_clock = RemainderClock(emitter)
-        self.remainder_heading = BoldLabel(calc.heading_remainder_time)
-        self.remaining_time = Gtk.Label(label=self.remainder_clock.get_time())
-
-        self.adjusted_clock = AdjustedClock(emitter)
-        self.adjusted_heading = BoldLabel(calc.heading_adjusted_time)
-        self.adjusted_local_time = Gtk.Label(label=self.adjusted_clock.get_time())
-
-        flowbox = Gtk.FlowBox(
-            row_spacing=20,
-            column_spacing=50,
-            min_children_per_line=2,
-            max_children_per_line=2,
-            margin=15,
-            halign=Gtk.Align.CENTER,
-            selection_mode=Gtk.SelectionMode.NONE,
-        )
-        flowbox.add(self.remainder_heading)
-        flowbox.add(self.adjusted_heading)
-        flowbox.add(self.remaining_time)
-        flowbox.add(self.adjusted_local_time)
-
-        recalc = Gtk.Button(
-            label=calc.calculate, halign=Gtk.Align.CENTER, margin_bottom=20
-        )
-        recalc.connect("clicked", self._on_recalc_clicked)
-
-        vbox = VBox()
-        vbox.extend([flowbox, recalc])
-        self.add(vbox)
-
-    def _on_remainder_changed(self, emitter: Emitter, time: datetime) -> None:
-        strtime = str(time.strftime(EXTENDED_TIME_FORMAT))
-        self.remaining_time.set_text(strtime)
-
-    def _on_adjusted_time_changed(self, emitter: Emitter, time: datetime) -> None:
-        strtime = str(time.strftime(EXTENDED_TIME_FORMAT))
-        self.adjusted_local_time.set_text(strtime)
-
-    def _on_recalc_clicked(self, button: Gtk.Button) -> None:
-        self.emitter.emit("calculate_button_clicked")
-
-
-class TimePickerFrame(Gtk.Frame):
-    def __init__(self, emitter: Emitter, stime: Time) -> None:
-        super().__init__(margin_start=50, margin_end=50)
-
-        self.emitter = emitter
-        self.emitter.connect("local_time_incremented", self._on_local_clock_increment)
-        self.emitter.connect("server_time_incremented", self._on_server_clock_increment)
-        self.emitter.connect(
-            "calculate_button_clicked", self._on_calculate_button_clicked
-        )
-
-        self.local_clock = LocalClock(self.emitter)
-        local_clock_time = self.local_clock.get_time()
-
-        self.server_time = ServerClock(stime, self.emitter, self.local_clock)
-        hour, minute = self.server_time.get_values()
-        self.picker = TimePicker(hour, minute)
-
-        self.local_timelabel = Gtk.Label(label=local_clock_time)
-        self.server_timelabel = Gtk.Label(label=stime.time, halign=Gtk.Align.CENTER)
-
-        h0 = BoldLabel(calc.heading_local_time)
-        h1 = BoldLabel(calc.heading_server_time)
-        h2 = BoldLabel(calc.heading_target_time)
-
-        self.icon_indicator = Icon(DAY_ICON)
-        self.update_server_icon()
-
-        server_time_box = HBox(10)
-        server_time_box.set_halign(Gtk.Align.CENTER)
-        server_time_box.extend([self.server_timelabel, self.icon_indicator])
-
-        flowbox = Gtk.FlowBox(
-            row_spacing=10,
-            column_spacing=50,
-            min_children_per_line=3,
-            max_children_per_line=3,
-            margin=15,
-            halign=Gtk.Align.CENTER,
-            selection_mode=Gtk.SelectionMode.NONE,
-        )
-        flowbox.add(h0)
-        flowbox.add(h1)
-        flowbox.add(h2)
-        flowbox.add(self.local_timelabel)
-        flowbox.add(server_time_box)
-        flowbox.add(self.picker)
-
-        self.add(flowbox)
-
-    def update_server_icon(self) -> None:
-        icon = DAY_ICON if self.server_time.is_day() else NIGHT_ICON
-        self.icon_indicator.set_icon_name(icon)
-
-    def _on_server_clock_increment(self, emitter: Emitter, time_now: datetime) -> None:
-        t = time_now.time().strftime("%H:%M")
-        self.server_timelabel.set_text(t)
-        self.update_server_icon()
-
-    def _on_local_clock_increment(
-        self, emitter: Emitter, time_now: datetime, elapsed: timedelta
-    ) -> None:
-        t = time_now.time().strftime(EXTENDED_TIME_FORMAT)
-        self.local_timelabel.set_text(t)
-
-    def _on_calculate_button_clicked(self, button: Gtk.Button) -> None:
-        if (self.picker.get_values()) == (self.server_time.get_values()):
-            total_time = timedelta(seconds=0)
-            self.emitter.emit("target_time_reset", total_time)
-        else:
-            picker_time = self.picker.get_time()
-            total_time = self.server_time.calc_delta(picker_time)
-            self.emitter.emit("target_time_changed", total_time)
-
-
-class ServerTimeCalculator(Gtk.ScrolledWindow):
-    def __init__(self, stime: Time) -> None:
-        super().__init__(propagate_natural_width=True)
-
-        self.emitter = Emitter()
-        outerbox = Gtk.Box(
-            halign=Gtk.Align.CENTER,
-            valign=Gtk.Align.START,
-            spacing=20,
-            orientation=Gtk.Orientation.VERTICAL,
-        )
-        time_picker_frame = TimePickerFrame(self.emitter, stime)
-        adjusted_time_frame = AdjustedTimeFrame(self.emitter)
-        disclaimer = Gtk.Label(
-            label=calc.disclaimer,
-            justify=Gtk.Justification.CENTER,
-        )
-        for el in time_picker_frame, adjusted_time_frame, disclaimer:
-            outerbox.add(el)
-        self.add(outerbox)

dzgui/views/dialogs/generic.py

@@ -309,14 +309,6 @@ class ExceptionDialog(TextBufferDialog):
         content.set_spacing(0)
         content.add(scrollable)
 
-        self.connect("map", self._on_map)
-
-    def _on_map(self, dialog: Self) -> None:
-        button = self.get_widget_for_response(Gtk.ResponseType.OK)
-        if button is None:
-            return
-        button.grab_focus()
-
     def _on_page_changed(
         self, notebook: Gtk.Notebook, child: Gtk.Box | Gtk.ScrolledWindow, index: int
     ) -> None:

dzgui/views/dialogs/servers.py

@@ -1,21 +1,20 @@
-import gi
 import html
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import CALCULATOR
+from dzgui.const.constants import EXPAND, FILL
 from dzgui.const.enum import ContextMenuGroup
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import css
+from dzgui.util import strings
 from dzgui.util.format import format_hyperlinks, format_server_mods
-from dzgui.strings import server_mods, dialogs
+from dzgui.strings import server_mods
-from dzgui.views.components.buttons import IconTextButton
-from dzgui.views.components.box import VBox
-from dzgui.views.dialogs.calc import Time, ServerTimeCalculator
 from dzgui.views.dialogs.generic import GenericDialog
 from dzgui.views.trees.tree_base import TreeView
 
+import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, Pango  # noqa
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa
 
 if TYPE_CHECKING:
     from dzgui.api.servers import Details
@@ -47,19 +46,12 @@ class ServerDialog(GenericDialog):
         self.connect("response", self._on_response)
         self.view.connect("key-press-event", self._on_keypress)
 
-        self.scrollable_tree = Gtk.ScrolledWindow(vexpand=True)
+        self.scrollable_tree = Gtk.ScrolledWindow()
         self.scrollable_tree.add(self.view)
-        self.scrollable_tree.set_size_request(700, 500)
+        self.scrollable_tree.set_size_request(700, 400)
-
-        self.stack = Gtk.Stack()
-        self.content_box = VBox(10)
-        self.content_box.set_valign(Gtk.Align.FILL)
-        self.content_box.add(self.scrollable_tree)
-
-        self.stack.add_named(self.content_box, "METADATA")
 
         self.content = self.get_content_area()
-        self.content.pack_start(self.stack, expand=True, fill=True, padding=0)
+        self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0)
 
     def _on_keypress(self, view: Gtk.TreeView, event: Gdk.EventKey) -> bool:
         # NOTE: ESC normally unfocuses treeview instead of destroying dialog
@@ -74,7 +66,9 @@ class ServerDialog(GenericDialog):
 
 class ServerDetailsDialog(ServerDialog):
     def __init__(self, controller: "Controller", details: "Details"):
-        super().__init__(controller, dialogs.server_details, details.name, menu=None)
+        # TODO: server name should also be packed in details struct
+        name = controller.get_server_name()
+        super().__init__(controller, strings.server_details, name, menu=None)
 
         self.store = Gtk.ListStore(str, str, Pango.Weight)
         self.view.connect("row-activated", self._on_row_activated)
@@ -91,9 +85,14 @@ class ServerDetailsDialog(ServerDialog):
             column.set_sort_column_id(i)
             column.set_expand(True)
 
-        scrollable_message = Gtk.ScrolledWindow(vexpand=True)
+        # NOTE: constrain tree area to logical height of metadata
-        desc = Gtk.Label(label=dialogs.server_message, valign=Gtk.Align.START)
+        # leaving room for server message
-        css.add_class(desc, "server-subheading")
+        self.scrollable_tree.set_size_request(700, 150)
+
+        # TODO: make "Server message" text boldface
+        scrollable_message = Gtk.ScrolledWindow()
+        desc = Gtk.Label(label=strings.server_message, valign=Gtk.Align.START)
+        css.add_class(desc, "details-heading")
         box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER)
         self.description = Gtk.Label(justify=Gtk.Justification.CENTER, wrap=True)
         sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
@@ -101,7 +100,11 @@ class ServerDetailsDialog(ServerDialog):
         for el in desc, sep, self.description:
             box.add(el)
         scrollable_message.add(box)
-        self.content_box.add(scrollable_message)
+
+        self.pack(scrollable_message)
+
+        if details.data is None:
+            return
 
         for row in details.data:
             self.store.append(row + [Pango.Weight.BOLD])
@@ -110,32 +113,8 @@ class ServerDetailsDialog(ServerDialog):
         text = format_hyperlinks(text)
         self.description.set_markup(html.escape(text))
 
-        calc_button = IconTextButton(CALCULATOR, dialogs.toggle_calc)
-        calc_button.connect("clicked", self._on_calc_pressed)
-        calc_button.set_halign(Gtk.Align.END)
-        calc_button.set_valign(Gtk.Align.START)
-        self.content.pack_start(calc_button, False, False, 0)
-        self.content.reorder_child(calc_button, 2)
-
-        self.scrollable_tree.set_size_request(700, 250)
-        self.calc = ServerTimeCalculator(
-            Time(details.gametime, details.day_accel, details.night_accel)
-        )
-        self.stack.add_named(self.calc, "CALCULATOR")
-
-        self.connect("map", self._on_map)
         self.show_all()
 
-    def _on_map(self, dialog: Self) -> None:
-        if widget := self.get_widget_for_response(Gtk.ResponseType.OK):
-            widget.grab_focus()
-
-    def _on_calc_pressed(self, button: Gtk.Button) -> None:
-        if self.stack.get_visible_child_name() == "METADATA":
-            self.stack.set_visible_child_name("CALCULATOR")
-        else:
-            self.stack.set_visible_child_name("METADATA")
-
     def _on_row_activated(
         self,
         treeview: Gtk.TreeView,

dzgui/views/dialogs/wizard.py

@@ -12,25 +12,21 @@ from dzgui.const.constants import (
     APP_NAME,
     APP_NAME_LOWER,
     HERO_PATH,
-    FLATPAK_ROOT_PATH,
     LEGACY_CONFIG_PATH,
-    TMP_PATH
 )
 from dzgui.const.boilerplate import config_boilerplate
 from dzgui.const.endpoints import STEAM_API_SETUP
 from dzgui.config import freedesktop
-from dzgui.init.proc import is_sandboxed, path_to_steam_cmd
 from dzgui.init.migrate import migrate_legacy_conf
 from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager
 from dzgui.strings import wizard
 from dzgui.util._json import write_json
-from dzgui.util.flatpak import apply_overrides
 from dzgui.util.open_links import open_link_by_url
 from dzgui.util.css import add_class, load_css
 from dzgui.views.components.buttons import WebButton
 from dzgui.views.components.entry import APIEntry
+from dzgui.views.components.misc import ClientCombo
 from dzgui.views.mixins.colorscheme import ColorAwareApp
-from dzgui.views.trees.tree_simple import SimpleTree
 
 import gi
 
@@ -48,8 +44,7 @@ class PageNum(Enum):
     STEAM_API = 4
     USER_PREFS = 5
     SHORTCUTS = 6
-    FLATPAK = 7
+    FINAL = 7
-    FINAL = 8
 
 
 class OptionalPageMixin:
@@ -148,7 +143,7 @@ class NotificationFrame(Gtk.Frame):
             margin_start=50,
             margin_end=50,
         )
-        wrapped = textwrap.fill(label, width=60)
+        wrapped = textwrap.fill(label, width=80)
         self.label = Gtk.Label(
             label=wrapped,
             justify=Gtk.Justification.CENTER,
@@ -162,7 +157,7 @@ class NotificationFrame(Gtk.Frame):
             add_class(self, "error-frame")
 
     def set_text(self, text: str) -> None:
-        wrapped = textwrap.fill(text, width=60)
+        wrapped = textwrap.fill(text, width=80)
         self.label.set_markup(wrapped)
 
 
@@ -247,23 +242,12 @@ class IntroductionPage(EnumeratedWizardPage):
     def __init__(self) -> None:
         super().__init__(
             enum=PageNum.INTRO,
-            heading=wizard.welcome.format(APP_NAME),
+            heading=f"Welcome to {APP_NAME}!",
             description=wizard.blurb_intro,
         )
         self.page_type = Gtk.AssistantPageType.INTRO
         self.set_title(wizard.title_intro)
 
-        self.error_box = NotificationFrame(wizard.error_sandbox, error=True)
-        self.add_start(self.error_box)
-
-        self.connect("map", self._on_map)
-
-    def _on_map(self, page: "EnumeratedWizardPage") -> None:
-        self.error_box.hide()
-        if is_sandboxed():
-            self.error_box.show()
-            EMITTER.emit("step_pending")
-
 
 class Heading(Gtk.Label):
     def __init__(self, label: str):
@@ -400,17 +384,26 @@ class PreferencesPage(EnumeratedWizardPage):
         self.dist_box.add(self.radio_km)
         self.dist_box.add(self.radio_miles)
 
+        client_label = Gtk.Label(label=wizard.label_client, halign=Gtk.Align.START)
+        self.client_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
+        self.client_combo = ClientCombo()
+        self.client_box.add(client_label)
+        self.client_box.add(self.client_combo)
+
         outer_box = Gtk.Box(
             orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER, spacing=10
         )
-        for el in self.name_box, self.dist_box:
+        for el in self.name_box, self.client_box, self.dist_box:
             outer_box.add(el)
         self.add_start(outer_box)
 
-    def get_prefs(self) -> tuple[str, bool]:
+    def get_prefs(self) -> tuple[str, bool, str]:
         name = self.name_entry.get_text().strip()
         use_miles = self.radio_miles.get_active()
-        return name, use_miles
+        model = self.client_combo.get_model()
+        ind = self.client_combo.get_active()
+        client = model[ind][1]
+        return name, use_miles, client
 
     def _on_entry_changed(self, entry: Gtk.Entry) -> None:
         text = entry.get_text()
@@ -420,44 +413,6 @@ class PreferencesPage(EnumeratedWizardPage):
         EMITTER.emit("step_complete")
 
 
-class FlatpakOverridePage(EnumeratedWizardPage):
-    def __init__(self, xdg_paths: dict[str, str]) -> None:
-        super().__init__(
-            enum=PageNum.FLATPAK,
-            heading=wizard.heading_flatpak,
-            description=wizard.blurb_flatpak,
-        )
-        self.xdg_paths = xdg_paths
-        self.page_type = Gtk.AssistantPageType.INTRO
-
-        store = Gtk.ListStore(str)
-        for path in xdg_paths.values():
-            store.append((str(path),))
-        store.append((TMP_PATH,))
-
-        tree = SimpleTree(store, wizard.tree_column)
-        tree.set_halign(Gtk.Align.CENTER)
-
-        self.authorize_button = Gtk.Button(
-            label=wizard.button_flatpak, halign=Gtk.Align.CENTER
-        )
-        self.authorize_button.connect("clicked", self._on_authorize)
-
-        self.notice = NotificationFrame(wizard.overrides_applied)
-        self.connect("map", self._on_map)
-
-        for el in tree, self.authorize_button, self.notice:
-            self.add_start(el)
-
-    def _on_map(self, page: "EnumeratedWizardPage") -> None:
-        self.notice.hide()
-
-    def _on_authorize(self, button: Gtk.Button) -> None:
-        apply_overrides(self.xdg_paths)
-        self.notice.show()
-        EMITTER.emit("step_complete")
-
-
 class CompletionPage(EnumeratedWizardPage):
     def __init__(self) -> None:
         super().__init__(
@@ -471,7 +426,7 @@ class CompletionPage(EnumeratedWizardPage):
 
 
 class Assistant(Gtk.Assistant):
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, str]):
+    def __init__(self, is_deck: bool, XDG: "Xdg"):
         super().__init__()
         if is_deck:
             # NOTE: deemed to be "safe" dimensions that exclude taskbar size
@@ -490,7 +445,6 @@ class Assistant(Gtk.Assistant):
         self.page_api = SteamValidationPage()
         self.page_prefs = PreferencesPage()
         self.page_shortcuts = ShortcutCreationPage(XDG.shortcut)
-        self.page_flatpak = FlatpakOverridePage(xdg_paths)
         self.page_completion = CompletionPage()
 
         self.set_forward_page_func(self._advance_page)
@@ -510,7 +464,6 @@ class Assistant(Gtk.Assistant):
             self.page_api,
             self.page_prefs,
             self.page_shortcuts,
-            self.page_flatpak,
             self.page_completion,
         ):
             # NOTE: skip config migration page if no legacy config file
@@ -531,10 +484,7 @@ class Assistant(Gtk.Assistant):
     def write_config(self, config: dict[str, Any]) -> None:
         write_json(config, self.config_path)
 
-    def get_completion_page(self) -> int:
+    def get_final_page(self) -> int:
-        return self.pages[self.page_completion]
-
-    def get_shortcut_page(self) -> int:
         return self.pages[self.page_shortcuts]
 
     def _advance_page(self, index: int) -> int:
@@ -546,40 +496,30 @@ class Assistant(Gtk.Assistant):
                 if page.is_migrated():
                     sp = page.migrated_conf["default_steam_path"]
                     self.page_shortcuts.set_steam_path(sp)
-                    self.config_values = self.page_migration.migrated_conf
+                    self.write_config(self.page_migration.migrated_conf)
-                    return self.get_shortcut_page()
+                    self.setup_complete = True
+                    return self.get_final_page()
             case SteamPathPage():
-                path = page.get_path_from_radio()
+                self.config_values["default_steam_path"] = page.get_path_from_radio()
-                self.config_values["default_steam_path"] = path
-                self.config_values["client"] = path_to_steam_cmd(path)
             case SteamValidationPage():
                 self.config_values["steam_api"] = page.get_api_key()
             case PreferencesPage():
                 # NOTE: collects config values before advancing to last page
-                name, use_miles = self.page_prefs.get_prefs()
+                name, use_miles, client = self.page_prefs.get_prefs()
                 self.config_values["name"] = name
                 self.config_values["use_miles"] = use_miles
+                self.config_values["client"] = client
+                self.write_config(self.config_values)
                 self.page_shortcuts.set_steam_path(
                     self.config_values["default_steam_path"]
                 )
+                self.setup_complete = True
             case ShortcutCreationPage():
                 page.create_shortcuts()
-                if not self.needs_flatpak_override():
-                    return self.get_completion_page()
-            case FlatpakOverridePage():
-                pass
             case _:
                 raise AttributeError("Trying to advance a non-canonical page")
         return index + 1
 
-    def needs_flatpak_override(self) -> bool:
-        if (
-            self.page_shortcuts.is_steam_checkbox_active()
-            and FLATPAK_ROOT_PATH in self.config_values["default_steam_path"]
-        ):
-            return True
-        return False
-
     def is_setup_complete(self) -> bool:
         return self.setup_complete
 
@@ -625,10 +565,6 @@ class Assistant(Gtk.Assistant):
         if not isinstance(page, IntroductionPage):
             EMITTER.emit("step_pending")
 
-        if page == self.page_completion:
-            self.write_config(self.config_values)
-            self.setup_complete = True
-
 
 class CheckboxWithLabel(Gtk.Box):
     def __init__(self, text: str, blurb_text: str) -> None:
@@ -705,9 +641,6 @@ class ShortcutCreationPage(OptionalPageMixin, EnumeratedWizardPage):  # type: ig
     def set_steam_path(self, path: Path) -> None:
         self.steam_path = path
 
-    def is_steam_checkbox_active(self) -> bool:
-        return self.steam_checkbox.get_active()
-
     def create_shortcuts(self) -> None:
         # NOTE: best-effort, permissive even on failure (page is already marked as complete)
         if self.steam_checkbox.get_active():
@@ -776,10 +709,10 @@ class SteamPathPage(EnumeratedWizardPage):
 
 
 class SetupWizard(ColorAwareApp, Gtk.Application):  # type: ignore
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, str]) -> None:
+    def __init__(self, is_deck: bool, XDG: "Xdg") -> None:
         super().__init__()
         GLib.set_prgname(APP_NAME)
-        self.win = Window(is_deck, XDG, xdg_paths)
+        self.win = Window(is_deck, XDG)
         Gtk.main()
 
     def is_setup_complete(self) -> int:
@@ -787,9 +720,9 @@ class SetupWizard(ColorAwareApp, Gtk.Application):  # type: ignore
 
 
 class Window(Gtk.Window):
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, str]) -> None:
+    def __init__(self, is_deck: bool, XDG: "Xdg") -> None:
         super().__init__(title=APP_NAME, icon_name=APP_NAME)
-        self.assistant = Assistant(is_deck, XDG, xdg_paths)
+        self.assistant = Assistant(is_deck, XDG)
 
 
 class Emitter(GObject.GObject):

dzgui/views/pages/options.py

@@ -9,9 +9,6 @@ from dzgui.const.constants import (
     APPID_DAYZ_EXP,
     APPNAME_DAYZ,
     APPNAME_DAYZ_EXP_HUMAN,
-    FLATPAK_RUN_CMD,
-    FLATPAK_SANDBOX,
-    FLATPAK_STEAM_PATH,
     NO_EXPAND,
     NO_FILL,
     NO_PADDING,
@@ -28,7 +25,7 @@ from dzgui.views.components.eventbox import InfoEventBox
 from dzgui.views.components.labels import LeftLabel
 from dzgui.views.components.buttons import SpinnerButton, WebButton
 from dzgui.views.components.frame import HeadingFrame
-from dzgui.views.components.misc import ErrorPopover
+from dzgui.views.components.misc import ClientCombo, ErrorPopover
 from dzgui.views.dialogs.generic import ExceptionDialog
 from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
 
@@ -79,7 +76,7 @@ class SubmitField(Gtk.Box):
             self.button = Gtk.Button(label=options.save_button)
 
         self.button.connect("clicked", self._on_save_clicked)
-        self.entry.connect("changed", self._on_text_typed)
+        self.entry.connect("insert-text", self._on_text_typed)
         self.entry.connect("activate", self._on_field_activated)
         self.entry.get_property("buffer").connect("deleted-text", self._on_text_deleted)
 
@@ -116,9 +113,13 @@ class SubmitField(Gtk.Box):
     def _on_text_typed(
         self,
         entry: Gtk.Entry,
+        text: str,
+        length: int,
+        pos: int,
     ) -> None:
 
-        text = entry.get_text()
+        buffer = entry.get_property("buffer")
+        text = buffer.get_text() + text
         state = self._is_valid_text(text)
         self.button.set_sensitive(state)
 
@@ -249,26 +250,6 @@ class ToggleField(Gtk.Box):
             el.set_sensitive(state)
 
 
-class FlatpakToggleField(ToggleField):
-    def __init__(
-        self,
-        controller: "Controller",
-    ) -> None:
-        super().__init__(
-            controller,
-            first_option=options.flatpak_standard,
-            second_option=options.flatpak_container,
-            context=Preferences.CLIENT,
-        )
-        self.add(InfoEventBox(options.flatpak_info, self.controller))
-        self.controller = controller
-        self.radio1.connect("toggled", self._on_radio_toggled, Preferences.CLIENT)
-
-    def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
-        cmd = FLATPAK_RUN_CMD if self.radio1.get_active() else FLATPAK_SANDBOX
-        self.controller.update_config(context, cmd)
-
-
 class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
     def __init__(self, controller: "Controller"):
         super().__init__(
@@ -297,7 +278,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         self.player_box.set_halign(Gtk.Align.START)
         self.player_box.get_children()[0].set_width_chars(30)  # type: ignore
 
-        self.flatpak_toggle = FlatpakToggleField(self.controller)
         self.fullscreen_toggle = ToggleField(
             self.controller,
             strings.options.last_used,
@@ -305,6 +285,11 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
             Preferences.WINDOW,
         )
 
+        self.client_combo = ClientCombo()
+        self.client_combo.connect("changed", self._on_client_changed)
+
+        client_hbox = ShortHBox(self.client_combo)
+
         self.distance_toggle = ToggleField(
             self.controller, strings.options.km, strings.options.mi, Preferences.DIST
         )
@@ -328,17 +313,12 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         self.start_tab_combo.connect("changed", self._on_start_tab_changed)
 
         pref_rows = [
+            [LeftLabel(strings.options.client), client_hbox],
             [LeftLabel(strings.options.window_size), self.fullscreen_toggle],
             [LeftLabel(strings.options.distance), self.distance_toggle],
             [LeftLabel(options.start_tab), start_tab_hbox],
             [LeftLabel(strings.options.name), self.player_box],
         ]
-        default = self.controller.query_config(Preferences.DEFAULT)
-        if FLATPAK_STEAM_PATH in default:
-            pref_rows.insert(
-                0,
-                [LeftLabel(options.flatpak_label), self.flatpak_toggle],
-            )
 
         self.dayz_version_label = Gtk.Label(label=strings.null)
         self.dayz_exp_version_label = Gtk.Label(label=strings.null)
@@ -391,11 +371,19 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
 
         self.connect("key-press-event", self._on_keypress)
 
+    def get_client_name(self) -> str:
+        model = self.client_combo.get_model()
+        ind = self.client_combo.get_active()
+        return str(model[ind][0])
+
     def block_text_entry(self) -> None:
         self.steam_box.block_text_entry()
+        # self.steam_entry.set_position(-1)
+        # self.steam_entry.set_can_focus(False)
 
     def unblock_text_entry(self) -> None:
         self.steam_box.unblock_text_entry()
+        # self.steam_entry.set_can_focus(True)
 
     def _on_developers_clicked(self, button: Gtk.Button) -> None:
         self.controller.show_developers_page()
@@ -430,6 +418,13 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         index = enum.value
         self.controller.update_config(Preferences.START_TAB, index)
 
+    def _on_client_changed(self, combo: Gtk.ComboBoxText) -> None:
+        _iter = combo.get_active_iter()
+        if _iter is None:
+            raise ValueError(f"No active iterator set on {combo}")
+        real_cmd = combo.get_model()[_iter][1]
+        self.controller.update_config(Preferences.CLIENT, real_cmd)
+
     def populate_settings(self) -> None:
         prefs = self.controller.get_prefs()
         # NOTE: re-check in case file was removed by user between runs
@@ -475,6 +470,10 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         self.dayz_version_label.set_text(dayz_version)
         self.dayz_exp_version_label.set_text(dayz_exp_version)
 
+        # TODO: bicolumn list store with no cell renderer on index 1, use raw command names
+        active_combo = query.get_client_index(config["client"])
+        self.client_combo.set_active(active_combo)
+
         start_tab = self.controller.query_config(Preferences.START_TAB)
         self.start_tab_combo.set_active(start_tab)
 

dzgui/views/pages/preconnect.py

@@ -176,7 +176,8 @@ class PreConnectionAssistant(Gtk.Box):
 
         self.error_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.error_tree = MaskedTree(ERROR)
-        self.error_placeholder = Placeholder(preconnect.no_errors)
+        # TODO: strings
+        self.error_placeholder = Placeholder("No errors.")
         self.error_box.add(self.error_tree)
         self.error_box.add(self.error_placeholder)
         self.error_frame = HeadingFrame.new_with_widget_and_label(
@@ -279,8 +280,6 @@ class PreConnectionAssistant(Gtk.Box):
             warnings.append(preconnect.protected_server)
         if prereqs.dayz_running is True:
             warnings.append(preconnect.dayz_running)
-        if len(prereqs.mods) > 0 and prereqs.download_paused:
-            warnings.append(preconnect.downloads_paused)
 
         allows_dl, running_app = prereqs.allows_downloads
         if len(prereqs.mods) > 0 and allows_dl is False:

dzgui/views/trees/tree_servers.py

@@ -66,7 +66,7 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
         self.handler_id: int
         self.queue: Queue = Queue()
 
-        self.seen_cache: list[Record] = []
+        self.seen_cache: list[str] = []
 
         prefs = self.controller.get_prefs()
         columns = prefs.paths.columns
@@ -252,6 +252,7 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
                 case Gdk.KEY_c:
                     self.controller.menu_action(ContextMenu.COPY_SERVER_IP, self)
                 case Gdk.KEY_r:
+                    # TODO: unimplemented, needs threading
                     self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
         else:
             match event.keyval:
@@ -340,24 +341,16 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
         control = self.proxy_man.get_control()
         return model, control
 
+    @staticmethod
     def ping_server(
-        self,
         model: "FastInsertListStore",
         _iter: Gtk.TreeIter,
-        record: Record,
+        ip: str,
+        qport: int,
+        ping_column: int,
     ) -> None:
-        _ping = ping(record.ip, record.qport)
+        _ping = ping(ip, qport)
-        GLib.idle_add(self._redraw, model, _iter, _ping)
+        GLib.idle_add(lambda: model.set(_iter, ping_column, _ping))
-
-    def _redraw(
-        self, model: "FastInsertListStore", _iter: Gtk.TreeIter, _ping: int
-    ) -> None:
-        ping_column = 9
-        model.set(_iter, ping_column, _ping)
-        self.queue_draw()
-
-    def wipe_cache(self) -> None:
-        self.seen_cache = []
 
     def _get_ping(
         self,
@@ -370,12 +363,13 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
 
         addr_column = 7
         qport_column = 8
+        ping_column = 9
 
         addr = model.get_value(_iter, addr_column).split(":")
         ip = addr[0]
-        gameport = int(addr[1])
+        gameport = addr[1]
         qport = model.get_value(_iter, qport_column)
-        record = Record(ip, gameport, qport)
+        record = f"{addr}:{gameport}:{qport}"
 
         if record in self.seen_cache:
             return
@@ -384,7 +378,7 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
         thread = threading.Thread(
             daemon=True,
             target=self.ping_server,
-            args=(model, _iter, record),
+            args=(model, _iter, ip, qport, ping_column),
         )
         thread.start()
 

dzgui/views/trees/tree_simple.py

@@ -1,35 +0,0 @@
-from typing import TYPE_CHECKING, Union
-
-if TYPE_CHECKING:
-    from dzgui.model.model_factory import FastInsertListStore
-
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa
-
-
-class SimpleTree(Gtk.ScrolledWindow):
-    """Simple scrollable 1-column tree"""
-
-    def __init__(
-        self, model: Union[Gtk.ListStore, "FastInsertListStore"], title: str
-    ) -> None:
-        super().__init__(
-            overlay_scrolling=False,
-            propagate_natural_width=True,
-            propagate_natural_height=True,
-        )
-
-        self.tree = Gtk.TreeView(model=model, enable_search=False)
-        renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn(title, renderer, text=0)
-        column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
-        column.set_resizable(False)
-        column.set_sort_column_id(0)
-        self.tree.append_column(column)
-
-        self.add(self.tree)
-
-    def get_tree(self) -> Gtk.TreeView:
-        return self.tree

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b29"
+version = "7.0.0b22"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"
@@ -47,7 +47,6 @@ docs = [
 ]
 test = [
     "black==25.1.0",
-    "hypothesis==6.167.1",
     "pre-commit==4.4.0",
     "pytest==8.4.2",
     "pytest-cov==7.0.0",
@@ -110,11 +109,10 @@ config-settings-package = { pygobject-stubs = { config = "Gtk3,Gdk3,Soup2" } }
 markers = [
     "apitest: checks remote endpoints",
     "config: config file keys/values",
-    "flatpak: depends on local flatpak installation",
+    "realconfig: depends on actual generated local config file",
     "mods: tests mod metadata/link creation",
     "pefile: validate PE files",
     "post_install: requires a completed installation",
-    "realconfig: depends on actual generated local config file",
     "redact: log redaction mechanisms",
     "slow: long-running tests",
     "webtest: depends on remote endpoint",

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

@@ -1,23 +0,0 @@
-"users"
-{
-	"0"
-	{
-		"AccountName"		"STEAMUSER"
-		"PersonaName"		"STEAMUSER"
-		"RememberPassword"		"0"
-		"WantsOfflineMode"		"0"
-		"SkipOfflineModeWarning"		"0"
-		"AutoLogin"		"1"
-		"timestamp"		"1787904411"
-	}
-	"1"
-	{
-		"AccountName"		"STEAMUSER2"
-		"PersonaName"		"STEAMUSER2"
-		"RememberPassword"		"0"
-		"WantsOfflineMode"		"0"
-		"SkipOfflineModeWarning"		"0"
-		"AutoLogin"		"1"
-		"timestamp"		"1787904647"
-	}
-}

tests/fixtures/api/loginusers_beta_client_multiple_2.vdf

@@ -1,23 +0,0 @@
-"users"
-{
-	"0"
-	{
-		"AccountName"		"STEAMUSER"
-		"PersonaName"		"STEAMUSER"
-		"RememberPassword"		"0"
-		"WantsOfflineMode"		"0"
-		"SkipOfflineModeWarning"		"0"
-		"AutoLogin"		"1"
-		"timestamp"		"1797904411"
-	}
-	"1"
-	{
-		"AccountName"		"STEAMUSER2"
-		"PersonaName"		"STEAMUSER2"
-		"RememberPassword"		"0"
-		"WantsOfflineMode"		"0"
-		"SkipOfflineModeWarning"		"0"
-		"AutoLogin"		"1"
-		"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"		"0"
 	}
 }

tests/test_client_name.py

@@ -1,19 +0,0 @@
-import pytest
-
-from dzgui.const.constants import FLATPAK_RUN_CMD, STEAM_CMD
-from dzgui.controllers.mc import Controller
-
-
-@pytest.mark.parametrize(
-    "value, expected", [(FLATPAK_RUN_CMD, "Flatpak"), (STEAM_CMD, "Steam")]
-)
-def test_human_name(monkeypatch, value, expected) -> None:
-    def mock_query_config(*args) -> str:
-        return value
-
-    monkeypatch.setattr(
-        "dzgui.controllers.mc.Controller.query_config", mock_query_config
-    )
-    controller = Controller()
-    client = controller.get_client_name()
-    assert client == expected

tests/test_colorscheme.py

@@ -10,7 +10,7 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio, GLib  # noqa
 
 
-class DummyWidget(ColorAwareApp, Gtk.Button):
+class TestWidget(ColorAwareApp, Gtk.Button):
     def __init__(self) -> None:
         super().__init__()
 
@@ -22,10 +22,11 @@ class DummyWidget(ColorAwareApp, Gtk.Button):
 
 
 @pytest.fixture
-def widget() -> DummyWidget:
+def widget() -> TestWidget:
-    return DummyWidget()
+    return TestWidget()
 
 
+@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_flatpak_override.py

@@ -1,45 +0,0 @@
-import configparser
-import pytest
-
-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
-
-PATHS_KEY = "Context"
-PATHS_SUBKEY = "filesystems"
-BUS_KEY = "Session Bus Policy"
-
-pytestmark = pytest.mark.flatpak
-
-
-@pytest.fixture
-def xdg_paths() -> dict[str, str]:
-    return get_xdg_paths()
-
-
-@pytest.fixture
-def override(xdg_paths) -> None:
-    apply_overrides(xdg_paths)
-
-
-@pytest.fixture
-def config(xdg_paths) -> configparser.ConfigParser:
-    conf_path = xdg_paths["XDG_DATA_HOME"].parent.joinpath(
-        f"flatpak/overrides/{FLATPAK_APPID}"
-    )
-    config = configparser.ConfigParser()
-    config.read(conf_path)
-    return config
-
-
-def test_session_bus(override, config) -> None:
-    bus = config[BUS_KEY][GTK_APP_ID]
-    assert bus == "own"
-
-
-def test_paths(override, xdg_paths, config) -> None:
-    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)

tests/test_flatpak_toggle.py

@@ -1,30 +0,0 @@
-import pytest
-
-from dzgui.const.constants import FLATPAK_RUN_CMD, FLATPAK_SANDBOX
-from dzgui.const.enum import Preferences
-from dzgui.views.pages.options import FlatpakToggleField
-
-
-class MockController:
-    def __init__(self) -> None:
-        self.command: str
-
-    def update_config(self, context: Preferences, cmd: str) -> None:
-        self.command = cmd
-
-    def get_command(self) -> str:
-        return self.command
-
-
-@pytest.mark.parametrize("index, expect", [(0, FLATPAK_RUN_CMD), (1, FLATPAK_SANDBOX)])
-def test_toggle(index: int, expect: str) -> None:
-    controller = MockController()
-    toggle = FlatpakToggleField(controller)
-    match index:
-        case 0:
-            toggle.radio2.set_active(True)
-            toggle.radio1.set_active(True)
-        case 1:
-            toggle.radio1.set_active(True)
-            toggle.radio2.set_active(True)
-    assert controller.get_command() == expect

tests/test_html_escaping.py

@@ -1,5 +1,3 @@
-import pytest
-
 from dzgui.api.servers import Details
 from dzgui.views.dialogs.servers import ServerDetailsDialog
 
@@ -23,18 +21,10 @@ class MockController:
         return None
 
 
-@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_html_escaping() -> None:
-    name = "Test server"
+    text = "<Server description> Game & mods"
-    desc = "<Server description> Game & mods"
+    details = Details([["0", "1"]], text, True)
-    gametime = "05:30"
-    day_accel = 5.0
-    night_accel = 1.0
-    details = Details([["0", "1"]], name, desc, gametime, day_accel, night_accel)
     controller = MockController()
     dialog = ServerDetailsDialog(controller, details)
-    dialog.destroy()
-    while Gtk.events_pending():
-        Gtk.main_iteration()
 
-    assert dialog.description.get_text() == desc
+    assert dialog.description.get_text() == text

tests/test_loginusers.py

@@ -3,7 +3,6 @@ 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
@@ -15,8 +14,6 @@ pytestmark = pytest.mark.apitest
         ("api/loginusers_legacy_client.vdf", 0),
         ("api/loginusers_legacy_client_multiple.vdf", 1),
         ("api/loginusers_beta_client.vdf", 0),
-        ("api/loginusers_beta_client_multiple.vdf", 1),
-        ("api/loginusers_beta_client_multiple_2.vdf", 0),
     ],
 )
 def test_loginusers(monkeypatch, fixture: str, expect: int) -> None:
@@ -26,11 +23,3 @@ 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

tests/test_path_conversion.py

@@ -1,13 +0,0 @@
-from pathlib import Path
-from dzgui.config.xdg import get_xdg_paths
-
-
-def test_path_fallback(monkeypatch) -> None:
-    envs = ["XDG_DATA_HOME", "XDG_STATE_HOME", "XDG_CONFIG_HOME", "XDG_CACHE_HOME"]
-    for env in envs:
-        monkeypatch.setenv(env, "/etc/dzgui")
-    paths = get_xdg_paths()
-    assert paths["XDG_CONFIG_HOME"] == Path.home().joinpath(".config/dzgui")
-    assert paths["XDG_STATE_HOME"] == Path.home().joinpath(".local/state/dzgui")
-    assert paths["XDG_DATA_HOME"] == Path.home().joinpath(".local/share/dzgui")
-    assert paths["XDG_CACHE_HOME"] == Path.home().joinpath(".cache/dzgui")

tests/test_paused_downloads.py

@@ -1,27 +0,0 @@
-import pytest
-from pathlib import Path
-
-from dzgui.api.steam import is_dayz_downloading
-
-
-@pytest.mark.parametrize(
-    "file_list, expect",
-    [
-        (["state_221100_1111.patch"], True),
-        (["state_730_1111.patch"], False),
-        (["state_1024020_1111.patch"], True),
-        (["221100"], False),
-        (["221100", "state_221100_1111.patch"], True),
-        (["state_221100_1111.patch", "state_1024020_1111.patch"], True),
-        (["state_221100_1111"], False),
-    ],
-)
-def test_dayz_patch_pending(monkeypatch, file_list, expect) -> None:
-    def mock_get_pending_downloads(steam_path: Path, appid: int) -> None:
-        files = [Path(file) for file in file_list]
-        return files
-
-    monkeypatch.setattr(
-        "dzgui.api.steam.get_pending_downloads", mock_get_pending_downloads
-    )
-    assert is_dayz_downloading(Path("/tmp"), Path("/tmp")) == expect

tests/test_process_detection.py

@@ -1,78 +0,0 @@
-import pytest
-import unittest
-from unittest.mock import patch
-
-from dzgui.const.constants import (
-    FLATPAK_APPID,
-    FLATPAK_ROOT_PATH,
-    FLATPAK_RUN_CMD,
-    FLATPAK_SANDBOX,
-)
-from dzgui.init import proc
-
-pytestmark = pytest.mark.flatpak
-
-
-class TestSteamDetection(unittest.TestCase):
-    def test_flatpak_detection_with_multiple_running_apps(self):
-        def flatpak_output(args, *, text):
-            # Default `flatpak ps` includes instance, PID, app and runtime columns.
-            if args == ["flatpak", "ps", "--columns=application"]:
-                return f"com.spotify.Client\n{FLATPAK_APPID}\n{FLATPAK_APPID}\n"
-            return f"3904921611\t1257689\t{FLATPAK_APPID}\torg.freedesktop.Platform\n"
-
-        with (
-            patch.object(proc, "has_cmd", return_value=True),
-            patch.object(proc.subprocess, "check_output", side_effect=flatpak_output),
-        ):
-            for client in (FLATPAK_RUN_CMD, FLATPAK_SANDBOX):
-                with self.subTest(client=client):
-                    self.assertTrue(proc.is_steam_running(client))
-
-    def test_flatpak_not_running(self):
-        with patch.object(proc, "has_cmd", return_value=True):
-            for output in ("", "com.spotify.Client\n", f"{FLATPAK_APPID}Helper\n"):
-                with (
-                    self.subTest(output=output),
-                    patch.object(proc.subprocess, "check_output", return_value=output),
-                ):
-                    self.assertFalse(proc.is_flatpak_steam_running())
-
-    def test_flatpak_not_installed(self):
-        with (
-            patch.object(proc, "has_cmd", return_value=False),
-            patch.object(proc.subprocess, "check_output") as check_output,
-        ):
-            self.assertFalse(proc.is_flatpak_steam_running())
-            check_output.assert_not_called()
-
-    def test_native_steam(self):
-        with patch.object(proc, "has_cmd", return_value=True):
-            for output, expected in (
-                (
-                    [
-                        [FLATPAK_ROOT_PATH],
-                        "/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper",
-                    ],
-                    True,
-                ),
-                ([[FLATPAK_ROOT_PATH]], False),
-                ([[FLATPAK_ROOT_PATH], ["steam-runtime-launcher-service"]], False),
-                ([["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"]], True),
-                (
-                    [
-                        ["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"],
-                        "steam-runtime-launcher-service",
-                    ],
-                    True,
-                ),
-            ):
-                with (
-                    self.subTest(running=output),
-                    patch.object(proc, "get_steam_procs", return_value=output),
-                ):
-                    self.assertEqual(proc.is_native_steam_running(), expected)
-
-    def test_invalid_client(self):
-        with self.assertRaises(TypeError):
-            proc.is_steam_running("invalid-client")

tests/test_server_metadata.py

@@ -1,45 +0,0 @@
-import pytest
-import re
-
-from dzgui.api.servers import Details, Record, get_details
-
-
-@pytest.fixture
-def details() -> Details:
-    """
-    Static official server, metadata is expected to be invariate
-    """
-    r = Record("85.190.157.111", 10400, 10401)
-    return get_details(r)
-
-
-def test_invalid_server() -> None:
-    r = Record("127.0.0.1", 10400, 10401)
-    assert get_details(r) is None
-
-
-@pytest.mark.parametrize("key, expect", [("day_accel", 2.3), ("night_accel", 6.8)])
-def test_time_accel(details, key, expect) -> None:
-    assert getattr(details, key) == expect
-
-
-def test_gametime(details) -> None:
-    time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
-    match = re.match(time_reg, details.gametime)
-    assert match is not None
-
-
-def test_metadata(details) -> None:
-    for row in details.data:
-        label, value = row
-        match label:
-            case "Password":
-                assert value == "Disabled"
-            case "Platform":
-                assert value == "Windows"
-            case "Battleye":
-                assert value == "Enabled"
-            case "Valve Anti-Cheat":
-                assert value == "Enabled"
-            case _:
-                pass

tests/test_server_time.py

@@ -1,112 +0,0 @@
-import pytest
-
-from hypothesis import given, strategies as st
-from datetime import datetime, timedelta
-
-from dzgui.views.dialogs.calc import (
-    LocalClock,
-    ServerClock,
-    Time,
-    TimePicker,
-    DAY_START_TIME,
-    DAY_END_TIME,
-)
-
-
-class DummyEmitter:
-    def __init__(self) -> None:
-        pass
-
-    def connect(self, _, __) -> None:
-        pass
-
-
-@pytest.fixture(params=[("05:00", 10.0), ("15:30", 5.0)])
-def accel_server_clock(request) -> None:
-    clock_time, expect = request.param
-    cur_time = Time(clock_time, 5.0, 2.0)
-    emitter = DummyEmitter()
-    local_clock = LocalClock(emitter)
-    server_clock = ServerClock(cur_time, emitter, local_clock)
-    return expect, server_clock
-
-
-def test_accel_factor(accel_server_clock) -> None:
-    """Static test checking times at known boundaries"""
-    expect, clock = accel_server_clock
-    assert clock.get_accel_factor(clock.cur_time) == expect
-
-
-def reference_calc(start, end, day_factor, night_factor):
-    """
-    Reference implementation to test validity of UI-side calculator
-    Aggregates total seconds and applies accel factors after
-    """
-    day_start = datetime.combine(start.date(), DAY_START_TIME)
-    day_end = datetime.combine(start.date(), DAY_END_TIME)
-    night_factor = day_factor * night_factor
-
-    if end < start:
-        end += timedelta(days=1)
-
-    day_max = max(start, day_start)
-    day_min = min(end, day_end)
-
-    next_day_start = datetime.combine(end.date(), DAY_START_TIME)
-    next_day_end = datetime.combine(end.date(), DAY_END_TIME)
-
-    range1 = (day_end - day_max).total_seconds()
-    range2 = (min(end, next_day_end) - next_day_start).total_seconds()
-
-    if end.date() > start.date():
-        day_seconds = max(0, range1) + max(0, range2)
-    else:
-        day_seconds = max(0, (day_min - day_max).total_seconds())
-
-    total_seconds = (end - start).total_seconds()
-    night_seconds = (total_seconds - day_seconds) / night_factor
-    day_seconds = day_seconds / day_factor
-    total = night_seconds + day_seconds
-
-    return timedelta(seconds=total)
-
-
-day_accel = st.floats(
-    min_value=1.0, max_value=24.0, allow_nan=False, allow_infinity=False
-)
-night_accel = st.floats(
-    min_value=1.0, max_value=64.0, allow_nan=False, allow_infinity=False
-)
-
-
-@st.composite
-def time_ranges(draw):
-    start_time = draw(st.times())
-    deltas = st.timedeltas(min_value=timedelta(0), max_value=timedelta(days=1))
-    duration = draw(deltas)
-
-    start = datetime.combine(datetime.now(), start_time)
-    end = start + duration
-    return start, end
-
-
-@given(span=time_ranges(), day_factor=day_accel, night_factor=night_accel)
-def test_time_aggregation(span, day_factor, night_factor) -> None:
-    start, end = span
-
-    strtime = start.strftime("%H:%M")
-    t = Time(strtime, day_factor, night_factor)
-    emitter = DummyEmitter()
-    local_clock = LocalClock(emitter)
-    server_clock = ServerClock(t, emitter, local_clock)
-    h = end.time().hour
-    m = end.time().minute
-    picker = TimePicker(h, m)
-
-    # NOTE: truncates microseconds to mimic widget HH:MM selection behavior
-    start = server_clock.get_datetime()
-    end = picker.get_time()
-    actual = server_clock.calc_delta(end)
-    expect = reference_calc(start, end, day_factor, night_factor)
-
-    assert actual == expect

tests/test_time.py

@@ -2,6 +2,7 @@ import re
 
 from dzgui.model.proxy_model import DAY_REG, NIGHT_REG
 
+
 def iterate(h: str, r: str) -> None:
     for m in range(60):
         time = f"{h:02}:{m:02}"
@@ -17,6 +18,6 @@ def test_day() -> None:
 
 def test_night() -> None:
     for h in range(24):
-        if 5 < h < 18:
+        if 6 < h < 17:
             continue
         iterate(h, NIGHT_REG)