From 58a7878f60d85fd1540a942d8ca748de7d51a058 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:26:34 +0900 Subject: [PATCH 01/10] fix: append mission param dynamically (#372) --- dzgui/api/steam.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dzgui/api/steam.py b/dzgui/api/steam.py index 397080c..cc9e99d 100644 --- a/dzgui/api/steam.py +++ b/dzgui/api/steam.py @@ -170,8 +170,10 @@ def launch_offline( "-skipintro", f"-name={name}", f"-mod={symlinks}", - f"-mission={mission}", ] + if len(mission) > 0: + arg = f"-mission={mission}" + params.append(arg) proc = subprocess.run([*client_args, *params]) return proc.returncode From 075a2e5a744f08f2f450a0ac2afe954aa8842eb2 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:26:49 +0900 Subject: [PATCH 02/10] chore: update rate limit consts --- dzgui/const/constants.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dzgui/const/constants.py b/dzgui/const/constants.py index cee5a63..58af7f2 100644 --- a/dzgui/const/constants.py +++ b/dzgui/const/constants.py @@ -4,7 +4,8 @@ UDP_PORT = 27016 VM_FILE = "/proc/sys/vm/max_map_count" MIN_COUNT = 1048576 -RATE_LIMIT_THRESHOLD = 3 +API_RATE_LIMIT = 1 +CLIENT_RATE_LIMIT = 3 REQUEST_TIMEOUT = 10 APPNAME_DAYZ = "DayZ" From 9225f3bc06a660b07aab4ee19049de7b3ca0cc97 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:27:46 +0900 Subject: [PATCH 03/10] chore: update strings --- dzgui/strings/dialogs.py | 3 ++- dzgui/strings/preconnect.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dzgui/strings/dialogs.py b/dzgui/strings/dialogs.py index 57c27a6..460250d 100644 --- a/dzgui/strings/dialogs.py +++ b/dzgui/strings/dialogs.py @@ -1,5 +1,6 @@ waiting_for_launch = "Waiting for DayZ to launch" -waiting_for_mods = "Waiting for Steam to update mods" +waiting_for_mods = "Queueing up mods (step 1/2)" +waiting_for_directories = "Steam is staging mods (step 2/2)" fetching_update = "Fetching update" failed_to_update = "Failed to update DZGUI executable" diff --git a/dzgui/strings/preconnect.py b/dzgui/strings/preconnect.py index 7b18939..07e5e57 100644 --- a/dzgui/strings/preconnect.py +++ b/dzgui/strings/preconnect.py @@ -10,6 +10,7 @@ warnings = "Warnings" errors = "Errors" 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." From ed20a7cc84e75a40c76a82a2529c308986b2308e Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:28:59 +0900 Subject: [PATCH 04/10] fix: update table checkmarks when mods are synched (#370) --- dzgui/controllers/emitter.py | 4 ++++ dzgui/views/pages/preconnect.py | 10 ++++++++-- dzgui/views/trees/tree_server_mods.py | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dzgui/controllers/emitter.py b/dzgui/controllers/emitter.py index c90aef7..46c5700 100644 --- a/dzgui/controllers/emitter.py +++ b/dzgui/controllers/emitter.py @@ -172,3 +172,7 @@ class Emitter(GObject.GObject): @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=()) def invalid_custom_mods(self) -> None: pass + + @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=()) + def all_mods_synched(self) -> None: + pass diff --git a/dzgui/views/pages/preconnect.py b/dzgui/views/pages/preconnect.py index 02ec5fc..d913e1e 100644 --- a/dzgui/views/pages/preconnect.py +++ b/dzgui/views/pages/preconnect.py @@ -23,6 +23,7 @@ from gi.repository import Gdk, Gtk # noqa E402 if TYPE_CHECKING: from dzgui.managers.connection import Prerequisites from dzgui.controllers.mc import Controller + from dzgui.controllers.emitter import Emitter @dataclass @@ -191,9 +192,14 @@ class PreConnectionAssistant(Gtk.Box): self.add(self.scrolled_box) self.add(self.button_box) + emitter = self.controller.get_emitter() + emitter.connect("all_mods_synched", self._on_mods_synched) self.connect("key-press-event", self._on_keypress) self.connect("map", self._on_map) + def _on_mods_synched(self, emitter: "Emitter") -> None: + self.tree.mark_mods_synched() + def _on_map(self, widget: Self) -> None: widgets = ( self.tree_frame, @@ -297,10 +303,10 @@ class PreConnectionAssistant(Gtk.Box): self._hide_mod_area() else: self._show_mod_area() - msg = "All mods are up to date." + msg = preconnect.up_to_date self.mod_count.set_text(msg) - if prereqs.required_space == 0: + if prereqs.required_space != 0: self.ok.set_label(preconnect.connect) pretty = number(prereqs.required_space) diff --git a/dzgui/views/trees/tree_server_mods.py b/dzgui/views/trees/tree_server_mods.py index 0659c31..4991846 100644 --- a/dzgui/views/trees/tree_server_mods.py +++ b/dzgui/views/trees/tree_server_mods.py @@ -13,6 +13,7 @@ from gi.repository import Gtk, GLib, Gdk, Pango # noqa if TYPE_CHECKING: from dzgui.controllers.mc import Controller + from dzgui.controllers.emitter import Emitter class ServerModTreeView(ContextMixin, TreeView): # type: ignore @@ -48,6 +49,10 @@ class ServerModTreeView(ContextMixin, TreeView): # type: ignore case _: pass + def mark_mods_synched(self) -> None: + for row in self.mod_store: + row[2] = server_mods.checkmark + # TODO: could be problematic if user downloads mods out of band def _on_row_activated( self, From 3ae0c8428a0b08c77208555be1adddb329db3f3f Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:29:39 +0900 Subject: [PATCH 05/10] change: ease rate limit --- dzgui/managers/connection.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dzgui/managers/connection.py b/dzgui/managers/connection.py index 27c2806..0a0fc74 100644 --- a/dzgui/managers/connection.py +++ b/dzgui/managers/connection.py @@ -25,17 +25,17 @@ from dzgui.api.mods import ( update_signatures, ) from dzgui.const.constants import ( + API_RATE_LIMIT, APP_NAME, APPID_DAYZ, APPID_DAYZ_EXP, APPNAME_DAYZ, APPNAME_DAYZ_EXP_HUMAN, - RATE_LIMIT_THRESHOLD, ) from dzgui.const.enum import NotebookPage, Preferences from dzgui.init.proc import is_dayz_running, is_steam_running from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager -from dzgui.strings.dialogs import waiting_for_launch, waiting_for_mods +from dzgui.strings.dialogs import waiting_for_launch, waiting_for_mods, waiting_for_directories from dzgui.strings.server_mods import checkmark, resync from dzgui.util.format import format_mib from dzgui.util.strings import dialog, server_timeout @@ -276,7 +276,6 @@ class ConnectionManager: self.thread_man.set_cleanup_func(func) return - self.thread_man.show_cancel(False) self.thread_man.update_dialog(waiting_for_launch) while True: # FIXME: cancel should not be visible here per setting above @@ -303,8 +302,9 @@ class ConnectionManager: if self.controller.is_cancel_pending(): return subscribe(key, int(mod)) - time.sleep(RATE_LIMIT_THRESHOLD) + time.sleep(API_RATE_LIMIT) + self.thread_man.update_dialog(waiting_for_directories) for title, mod, stamp, size in self.missing_mods: mod_path = self.workshop / mod @@ -322,8 +322,12 @@ class ConnectionManager: time.sleep(1) update_signatures(self.missing_mods, prefs.paths.version) - # TODO: just push steam path directly rebuild_symlinks(prefs.paths.config) + + # NOTE: update table status in main loop + self.thread_man.update_emitter("all_mods_synched") + + # TODO: just push steam path directly self._connect_steam(menu_only) @call_on_thread(waiting_for_mods, show_cancel=True) From 780402d14fdeb9324adaf61a8a79075850e63fdf Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:29:54 +0900 Subject: [PATCH 06/10] change: ease rate limit --- dzgui/managers/mods.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dzgui/managers/mods.py b/dzgui/managers/mods.py index af27090..4d0170c 100644 --- a/dzgui/managers/mods.py +++ b/dzgui/managers/mods.py @@ -12,10 +12,10 @@ from dzgui.api.mods import ( remove_stale_signatures, ) from dzgui.const.constants import ( + API_RATE_LIMIT, APP_NAME, APPID_DAYZ, APPID_DAYZ_EXP, - RATE_LIMIT_THRESHOLD, ) from dzgui.const.enum import Preferences from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager @@ -109,6 +109,7 @@ class ModManager: def unsub_all_mods(self, mods: list[tuple[str, Gtk.TreeIter]]) -> None: for mod, _iter in mods: self.unsub_atomic_mod(mod) + time.sleep(API_RATE_LIMIT) iters = [_iter for mod, _iter in mods] func = StoredFunc(self._on_mods_unsubbed, iters) @@ -136,7 +137,7 @@ class ModManager: symlink.unlink() except PeFile.AppNotInstalledError: pass - time.sleep(RATE_LIMIT_THRESHOLD) + time.sleep(API_RATE_LIMIT) def _on_mods_unsubbed(self, iters: list[Gtk.TreeIter]) -> None: if self.store is None: From 796f6b84356fff5437d8378b3bb50bd2c94f38fc Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:30:08 +0900 Subject: [PATCH 07/10] feat: call emitter from ThreadingManager --- dzgui/managers/threading.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dzgui/managers/threading.py b/dzgui/managers/threading.py index adecb7a..c20f324 100644 --- a/dzgui/managers/threading.py +++ b/dzgui/managers/threading.py @@ -81,6 +81,11 @@ class ThreadingManager: def set_job_count(self, jobs: int) -> None: self.jobs = jobs + def update_emitter(self, signal: str) -> None: + if self.controller: + emitter = self.controller.get_emitter() + GLib.idle_add(lambda: emitter.emit(signal)) + def update_dialog(self, msg: str) -> None: GLib.idle_add(lambda: self.wait_dialog.update_text(msg)) From 5e3392ddeceadb318a6e8a92b9a092d6613478f5 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 18:30:35 +0900 Subject: [PATCH 08/10] chore: drop unused import --- dzgui/views/trees/tree_server_mods.py | 1 - 1 file changed, 1 deletion(-) diff --git a/dzgui/views/trees/tree_server_mods.py b/dzgui/views/trees/tree_server_mods.py index 4991846..fe1169c 100644 --- a/dzgui/views/trees/tree_server_mods.py +++ b/dzgui/views/trees/tree_server_mods.py @@ -13,7 +13,6 @@ from gi.repository import Gtk, GLib, Gdk, Pango # noqa if TYPE_CHECKING: from dzgui.controllers.mc import Controller - from dzgui.controllers.emitter import Emitter class ServerModTreeView(ContextMixin, TreeView): # type: ignore From fa8792ba69ff5c11ec9fbd0f7670c48082e4f7ad Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 19:45:27 +0900 Subject: [PATCH 09/10] chore: add logging when opening options page --- dzgui/controllers/mc.py | 7 +++++-- dzgui/views/pages/options.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index ae0bf6d..f2a93cd 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -23,7 +23,7 @@ from dzgui.managers.contextmenu import ContextMenuManager from dzgui.managers.notes import NoteManager from dzgui.model.servers import ServerModelManager from dzgui.util.diag import write_diagnostic -from dzgui.util.format import format_player_count +from dzgui.util.format import format_exception, format_player_count from dzgui.util.open_links import open_user_workshop, open_workshop_page from dzgui.views.dialogs.filepicker import FilePicker from dzgui.views.dialogs.generic import ExceptionDialog @@ -203,7 +203,10 @@ class Controller(GObject.GObject): try: # TODO: where to put config file check self.mediator.grid.notebook.settings.populate_settings() - except Exception: + except Exception as e: + msg = format_exception(e) + print(msg) + logger.critical(msg) return case ButtonType.MODS: self.load_mods() diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index 066a7cf..aea0417 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -392,7 +392,7 @@ class Options(Gtk.Box): if prefs.paths.config.is_file() is False: dialog = ExceptionDialog(self.controller, strings.config_not_found) dialog.run() - raise Exception + raise OSError(f"Config file '{prefs.paths.config}' not found") config = query.get_config(prefs.paths.config) From 5c85c746f113288d86c754998a4477c783a0f270 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sat, 20 Jun 2026 23:28:48 +0900 Subject: [PATCH 10/10] fix: update button label conditionally --- dzgui/views/pages/preconnect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dzgui/views/pages/preconnect.py b/dzgui/views/pages/preconnect.py index d913e1e..463228d 100644 --- a/dzgui/views/pages/preconnect.py +++ b/dzgui/views/pages/preconnect.py @@ -307,12 +307,12 @@ class PreConnectionAssistant(Gtk.Box): self.mod_count.set_text(msg) if prereqs.required_space != 0: - self.ok.set_label(preconnect.connect) - pretty = number(prereqs.required_space) suffix = f" Need to download {pretty} MiB of mod updates." prefix = preconnect.total_mods self.mod_count.set_text(f"{prefix}{str(total_mods)}.{suffix}") + else: + self.ok.set_label(preconnect.connect) if prereqs.is_last_server: self.connect_last.show()