chore: update test decorator

fix: add path out of loop

README.md

@@ -17,7 +17,7 @@ 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
+- Target Linux desktop and Steam Deck specifically; not a cross-platform tool
 
 ## Setup and usage
 
@@ -35,6 +35,8 @@ 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/shortcuts.py

@@ -173,11 +173,12 @@ class Shortcuts:
         self.save_shortcuts()
 
     def save_shortcuts(self) -> None:
-        try:
-            backup = self.shortcuts_path.with_suffix(".vdf.bak")
-            shutil.copy(self.shortcuts_path, backup)
-        except Exception as e:
-            logger.critical(e)
+        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)

dzgui/api/steam.py

@@ -12,8 +12,9 @@ from typing import Any, Generator, Union
 from warnings import deprecated
 
 from dzgui.api.acf import ACF
+from dzgui.const.endpoints import VALIDATE
 from dzgui.init.prereqs import has_any_client
-from dzgui.init.proc import has_cmd
+from dzgui.init.prereqs import has_flatpak_client, has_steam_client
 from dzgui.const.constants import (
     APPID_DAYZ,
     APPID_DAYZ_EXP,
@@ -23,11 +24,10 @@ from dzgui.const.constants import (
     DEBIAN_STEAM_PATH,
     DEFAULT_STEAM_PATH,
     DOWNLOADS_PATH,
-    FLATPAK_CMD,
     FLATPAK_STEAM_PATH,
     LIBRARYFOLDERS_PATH,
-    UBUNTU_STEAM_PATH,
     REQUEST_TIMEOUT,
+    UBUNTU_STEAM_PATH,
     VDF_PATH,
 )
 from dzgui.const.endpoints import (
@@ -84,7 +84,9 @@ 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_cmd(FLATPAK_CMD) is False:
+            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]))
@@ -315,10 +317,9 @@ def unsubscribe(key: str, mod: int) -> None:
     update_workshop(key, mod, UNSUB_ENDPOINT)
 
 
-@deprecated("Use subscribe()")
-def enqueue_mod(client: str, mod: str, appid: int) -> None:
+def validate_mod(client: str, mod: str) -> None:
     client_args = concat_bash_args(client)
-    subprocess.Popen([*client_args, "+workshop_download_item", str(appid), mod])
+    subprocess.Popen([*client_args, "+workshop_download_item", str(APPID_DAYZ), mod])
 
 
 @deprecated("Cf. https://github.com/ValveSoftware/steam-for-linux/issues/9672")
@@ -499,3 +500,10 @@ def get_app_name(appid: int) -> str | None:
     except Exception as e:
         logger.debug(e)
         return None
+
+
+@deprecated("Currently unused")
+def validate_dayz(client: str) -> None:
+    client_args = concat_bash_args(client)
+    uri = VALIDATE + str(APPID_DAYZ)
+    subprocess.Popen([*client_args, uri])

dzgui/app_init.py

@@ -2,12 +2,17 @@ import logging
 import os
 import shutil
 
+from importlib import resources
 from pathlib import Path
 from typing import TYPE_CHECKING
-from warnings import deprecated
 
 
-from dzgui.const.constants import APP_NAME, STEAM_ICON, STEAM_ICONS_PATH
+from dzgui.const.constants import (
+    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
@@ -18,7 +23,7 @@ from dzgui.init.migrate import (
     migrate_cols_file,
 )
 from dzgui.init.flock import lock_acquire
-from dzgui.init.prereqs import has_any_client
+from dzgui.init.prereqs import has_flatpak_client, has_steam_client
 from dzgui.strings import boot
 
 from dzgui.util.deck import is_steam_deck, is_game_mode
@@ -26,7 +31,7 @@ from dzgui.util.dirs import make_parents
 from dzgui.util.localize import set_locale
 from dzgui.util.map_count import test_map_count
 from dzgui.util.redact import RedactionFilter, REDACTION_PATTERNS
-from dzgui.util.strings import init, steam_icon_missing
+from dzgui.util.strings import init
 
 from dzgui.views.base import App
 from dzgui.views.dialogs.boot import BootWindow
@@ -99,26 +104,21 @@ def copy_bare_configs(config: "Path", resolution: "Path") -> tuple[bool, bool]:
     return (config_changed, state_changed)
 
 
-@deprecated("Currently unused")
-def load_steam_icon(config: Path) -> None:
+def load_steam_icon() -> None:
     import gi
 
     gi.require_version("Gtk", "3.0")
     from gi.repository import Gtk  # noqa
 
-    default = lookup(config, Preferences.DEFAULT)
-    icon_path = Path(default).joinpath(STEAM_ICONS_PATH)
     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(icon_path)])
-        paths = theme.get_search_path()
-        icons = theme.list_icons(None)
-        if STEAM_ICON not in icons:
-            logger.warning(steam_icon_missing)
+        theme.set_search_path(paths + [str(icons)])
     except Exception as e:
-        print(e)
-        logger.warning(e)
+        logger.critical(e)
 
 
 def load_gui(version: str, is_debug: bool) -> None:
@@ -161,7 +161,11 @@ def load_gui(version: str, is_debug: bool) -> None:
         # TODO: sudo escalation dialog
         # count = get_map_count()
         # TODO: move into module
-        if has_any_client() is False:
+        if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
+            has_client = has_flatpak_client()
+        else:
+            has_client = has_steam_client()
+        if has_client is False:
             EarlyAlertDialog(init.requires_steam)
 
     bootwin = BootWindow(XDG, version)
@@ -180,5 +184,6 @@ 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/const/constants.py

@@ -51,7 +51,7 @@ INPUT_KEYBOARD = "input-keyboard-symbolic"
 LIST_ADD = "list-add-symbolic"
 REFRESH_ICON = "view-refresh-symbolic"
 SEARCH_ICON = "system-search-symbolic"
-STEAM_ICON = "steam_tray_mono"
+STEAM_ICON = "steam-tray-symbolic"
 VIEW_CONCEAL = "view-conceal-symbolic"
 VIEW_REVEAL = "view-reveal-symbolic"
 WARNING = "dialog-warning-symbolic"
@@ -80,6 +80,7 @@ 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"
@@ -89,13 +90,13 @@ FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
 FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
 UBUNTU_STEAM_PATH = ".steam/steam"
 DEBIAN_STEAM_PATH = ".steam/debian-installation"
-STEAM_ICONS_PATH = "public"
 
 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/const/endpoints.py

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

dzgui/const/enum.py

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

dzgui/controllers/emitter.py

@@ -111,6 +111,10 @@ 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

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

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

@@ -0,0 +1 @@
+<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/flock.py

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

dzgui/init/prereqs.py

@@ -3,11 +3,14 @@ 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"],

dzgui/managers/contextmenu.py

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

dzgui/managers/mods.py

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

dzgui/model/servers.py

@@ -92,6 +92,7 @@ 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):
@@ -414,6 +415,8 @@ 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/dialogs.py

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

dzgui/strings/wizard.py

@@ -19,7 +19,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 paths found on system. Please install Steam to continue."
+    "No valid Steam path or Steam command found on system. Please install Steam to continue."
 )
 button_scan = "Scan for Steam"
 

dzgui/util/flatpak.py

@@ -1,7 +1,7 @@
 import logging
 import subprocess
 
-from dzgui.const.constants import APP_NAME, FLATPAK_APPID, GTK_APP_ID
+from dzgui.const.constants import APP_NAME, FLATPAK_APPID, GTK_APP_ID, TMP_PATH
 
 logger = logging.getLogger(APP_NAME)
 
@@ -18,7 +18,11 @@ def apply_overrides(xdg: dict[str, str]) -> None:
         ]
         subprocess.run([*args], capture_output=True)
 
-        for path in xdg.values():
+        paths: list[str] = []
+        paths.extend([*xdg.values()])
+        paths.append(TMP_PATH)
+
+        for path in paths:
             args = [
                 "flatpak",
                 "--user",

dzgui/util/strings.py

@@ -31,6 +31,7 @@ show_details = "Show server details"
 refresh_players = "Refresh player count"
 open_workshop = "Open in Steam Workshop"
 unsub_mod = "Unsubscribe mod"
+validate_mod = "Validate mod"
 copy_name = "Copy name to clipboard"
 copy_ip = "Copy IP to clipboard"
 copy_log = "Copy record(s) to clipboard"
@@ -200,6 +201,8 @@ class ModPanelStrings:
     clear_highlights: str
     select_stale: str
     select_stale_tooltip: str
+    validate: str
+    validate_tooltip: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -297,7 +300,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="DZGUI requires that Steam or Flatpak Steam be installed on the system.",
+    requires_steam="Your chosen client (Steam/Flatpak Steam) must be installed on the system.",
 )
 
 mod_panel = ModPanelStrings(
@@ -319,6 +322,8 @@ mod_panel = ModPanelStrings(
     clear_highlights="Clears highlights and reverts the table to a default state",
     select_stale="Select stale",
     select_stale_tooltip="Only selects highlighted stale mods",
+    validate="Validate selected",
+    validate_tooltip="Validates selected mods and updates them if necessary",
 )
 
 

dzgui/views/components/buttons.py

@@ -163,18 +163,24 @@ class RefreshButton(IconTextButton):
         self.set_tooltip_text(atomic_buttons.refresh_tooltip)
 
         self.connect("clicked", self._on_refresh_clicked)
-        emitter.connect("servers_loaded", self.start_decrement)
+        emitter.connect("servers_loaded", self._on_load)
+        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, emitter: "Emitter", tab: "ServerTab") -> None:
+    def start_decrement(self) -> None:
         if self.is_clicked is False:
             return
         if self.loading:

dzgui/views/components/mod_panel.py

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

dzgui/views/dialogs/wizard.py

@@ -14,6 +14,7 @@ from dzgui.const.constants import (
     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
@@ -432,6 +433,8 @@ class FlatpakOverridePage(EnumeratedWizardPage):
         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)
 

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b28"
+version = "7.0.0b29"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"
@@ -110,10 +110,11 @@ config-settings-package = { pygobject-stubs = { config = "Gtk3,Gdk3,Soup2" } }
 markers = [
     "apitest: checks remote endpoints",
     "config: config file keys/values",
-    "realconfig: depends on actual generated local config file",
+    "flatpak: depends on local flatpak installation",
     "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/test_config.py

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

tests/test_flatpak_override.py

@@ -0,0 +1,43 @@
+import configparser
+import pytest
+
+from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID
+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 = xdg_paths
+    paths = config[PATHS_KEY][PATHS_SUBKEY].split(";")
+    assert all(str(path) in paths for path in expect.values())

tests/test_html_escaping.py

@@ -1,3 +1,5 @@
+import pytest
+
 from dzgui.api.servers import Details
 from dzgui.views.dialogs.servers import ServerDetailsDialog
 
@@ -21,6 +23,7 @@ class MockController:
         return None
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_html_escaping() -> None:
     name = "Test server"
     desc = "<Server description> Game & mods"
@@ -31,5 +34,7 @@ def test_html_escaping() -> None:
     controller = MockController()
     dialog = ServerDetailsDialog(controller, details)
     dialog.destroy()
+    while Gtk.events_pending():
+        Gtk.main_iteration()
 
     assert dialog.description.get_text() == desc

tests/test_process_detection.py

@@ -1,3 +1,4 @@
+import pytest
 import unittest
 from unittest.mock import patch
 
@@ -9,6 +10,8 @@ from dzgui.const.constants import (
 )
 from dzgui.init import proc
 
+pytestmark = pytest.mark.flatpak
+
 
 class TestSteamDetection(unittest.TestCase):
     def test_flatpak_detection_with_multiple_running_apps(self):