tworu/dzgui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2026-08-29 03:06:56 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: use conditional logic when testing GLibUnix

Browse Source
This commit is contained in:
aclist 2026-04-13 03:43:22 +09:00
parent c5eba364d9
commit d1bde9901d
4 changed files with 92 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## [6.0.2-beta.5] 2026-04-12
## Fixed
- Use conditional logic when testing GLibUnix namespaces
## [6.0.2-beta.4] 2026-04-10 ## [6.0.2-beta.4] 2026-04-10
## Fixed ## Fixed
- Use GLibUnix namespace when setting up SIGINT handling - Use GLibUnix namespace when setting up SIGINT handling

6
dzgui.sh
View File

@ -2,7 +2,7 @@
set -o pipefail set -o pipefail
src_path="$(readlink -e "$0")" src_path="$(readlink -e "$0")"
version=6.0.2-beta.4 version=6.0.2-beta.5
#CONSTANTS #CONSTANTS
aid=221100 aid=221100
@ -626,10 +626,10 @@ fetch_helpers_by_sum(){
[[ -f "$config_file" ]] && source "$config_file" [[ -f "$config_file" ]] && source "$config_file"
declare -A sums declare -A sums
sums=( sums=(
["funcs"]="a823824ec835a7db836aaff0eccd3a50" ["funcs"]="cf9854b7df35af8ec772fbc56785e64e"
["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
["servers.py"]="ed442c3aecf33f777d59dcf53650d263" ["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
["ui.py"]="d00c37fd006fa8cfb7fd02a8505e67e0" ["ui.py"]="cf52a3d5883afe02a013d8673df494fa"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["pefile.py"]="b452974a84bff1d821872fcebf59e380" ["pefile.py"]="b452974a84bff1d821872fcebf59e380"
) )

2
helpers/funcs
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -o pipefail set -o pipefail
version="6.0.2-beta.4" version="6.0.2-beta.5"
#CONSTANTS #CONSTANTS
aid=221100 aid=221100

267
helpers/ui.py
View File

@ -38,6 +38,7 @@ if TYPE_CHECKING:
locale.setlocale(locale.LC_ALL, "") locale.setlocale(locale.LC_ALL, "")
import gi # noqa E402 import gi # noqa E402
gi.require_version("Gtk", "3.0") gi.require_version("Gtk", "3.0")
gi.require_version("GLibUnix", "2.0") gi.require_version("GLibUnix", "2.0")
from gi.repository import Gtk, GLib, GLibUnix, Gdk, GObject, Pango # noqa E402 from gi.repository import Gtk, GLib, GLibUnix, Gdk, GObject, Pango # noqa E402
@ -853,9 +854,7 @@ def call_out(command: str, *args: str) -> subprocess.CompletedProcess:
arg_ar = [] arg_ar = []
for i in args: for i in args:
arg_ar.append(i) arg_ar.append(i)
logger.info( logger.info(f"Context '{name}' calling subprocess '{command}' with args '{arg_ar}'")
f"Context '{name}' calling subprocess '{command}' with args '{arg_ar}'"
)
proc = subprocess.run( proc = subprocess.run(
["/usr/bin/env", "bash", funcs, command] + arg_ar, ["/usr/bin/env", "bash", funcs, command] + arg_ar,
capture_output=True, capture_output=True,
@ -881,9 +880,7 @@ def spawn_dialog(msg: str, mode: Popup) -> bool:
return False return False
def process_shell_return_code( def process_shell_return_code(msg: str, code: int, original_input: RowType) -> None:
msg: str, code: int, original_input: RowType
) -> None:
logger.info( logger.info(
f"Processing return code '{code}' for the input " f"Processing return code '{code}' for the input "
f"'{original_input}', returned message '{msg}'" f"'{original_input}', returned message '{msg}'"
@ -910,9 +907,7 @@ def process_shell_return_code(
spawn_dialog("Invalid Steam API key, reverting", Popup.NOTIFY) spawn_dialog("Invalid Steam API key, reverting", Popup.NOTIFY)
App.notebook.settings.revert(Preferences.STEAM) App.notebook.settings.revert(Preferences.STEAM)
case 79: # failed settings update (bm) case 79: # failed settings update (bm)
spawn_dialog( spawn_dialog("Invalid Battlemetrics API key, reverting", Popup.NOTIFY)
"Invalid Battlemetrics API key, reverting", Popup.NOTIFY
)
App.notebook.settings.revert(Preferences.BM) App.notebook.settings.revert(Preferences.BM)
case 80: # pop toast after successful settings change case 80: # pop toast after successful settings change
config_vals.clear() config_vals.clear()
@ -978,9 +973,7 @@ def call_on_thread(
if state: if state:
wait_dialog = GenericDialog(msg, Popup.WAIT) wait_dialog = GenericDialog(msg, Popup.WAIT)
wait_dialog.show_all() wait_dialog.show_all()
thread = threading.Thread( thread = threading.Thread(target=_background, args=(subproc, args, wait_dialog))
target=_background, args=(subproc, args, wait_dialog)
)
thread.start() thread.start()
else: else:
""" """
@ -1005,18 +998,14 @@ def process_tree_option(choice: RowType) -> None:
record = App.treeview.get_record_string() record = App.treeview.get_record_string()
wait_msg = command.dict["wait_msg"] wait_msg = command.dict["wait_msg"]
show_wait_dialog = True show_wait_dialog = True
call_on_thread( call_on_thread(show_wait_dialog, cmd_string, wait_msg, record, choice=choice)
show_wait_dialog, cmd_string, wait_msg, record, choice=choice
)
return return
# modlist highlight stale action # modlist highlight stale action
if context == WindowContext.TABLE_MODS and command == RowType.HIGHLIGHT: if context == WindowContext.TABLE_MODS and command == RowType.HIGHLIGHT:
wait_msg = command.dict["wait_msg"] wait_msg = command.dict["wait_msg"]
show_wait_dialog = True show_wait_dialog = True
call_on_thread( call_on_thread(show_wait_dialog, cmd_string, wait_msg, "", choice=choice)
show_wait_dialog, cmd_string, wait_msg, "", choice=choice
)
return return
if command == RowType.CHANGELOG: if command == RowType.CHANGELOG:
@ -1084,12 +1073,8 @@ def prepare_connection(rowtype: RowType, record: Record) -> None:
thread = threading.Thread(target=background, args=(rowtype, record)) thread = threading.Thread(target=background, args=(rowtype, record))
thread.start() thread.start()
def try_connect(
addr: str, def try_connect(addr: str, appid: str, path: str, row: RowType) -> None:
appid: str,
path: str,
row: RowType
) -> None:
def background(addr, appid, path): def background(addr, appid, path):
def cleanup(): def cleanup():
App.treeview.dialog_hide() App.treeview.dialog_hide()
@ -1152,6 +1137,7 @@ def connect_by_ip(enum: RowType, response: str) -> None:
return return
prepare_connection(enum, record) prepare_connection(enum, record)
def connect_by_id(enum: RowType, response: str, key: str) -> None: def connect_by_id(enum: RowType, response: str, key: str) -> None:
def _prep(key: str, response: str) -> None: def _prep(key: str, response: str) -> None:
def cleanup() -> None: def cleanup() -> None:
@ -1180,9 +1166,7 @@ def process_user_input(enum: RowType) -> None:
if enum == RowType.CONN_BY_ID: if enum == RowType.CONN_BY_ID:
key = query_config("api_key")[0] key = query_config("api_key")[0]
if len(key) == 0: if len(key) == 0:
spawn_dialog( spawn_dialog("No Battlemetrics API key is set; see Options", Popup.NOTIFY)
"No Battlemetrics API key is set; see Options", Popup.NOTIFY
)
return return
user_entry = EntryDialog(prompt, Popup.ENTRY, link_label) user_entry = EntryDialog(prompt, Popup.ENTRY, link_label)
@ -1203,9 +1187,7 @@ def process_user_input(enum: RowType) -> None:
show_wait_dialog = True show_wait_dialog = True
wait_msg = "Working" wait_msg = "Working"
call_on_thread( call_on_thread(show_wait_dialog, cmd_string, wait_msg, response, choice=enum)
show_wait_dialog, cmd_string, wait_msg, response, choice=enum
)
return return
@ -1293,9 +1275,7 @@ class OuterWindow(Gtk.Window):
logger.info(f"Using default window size {w},{h}") logger.info(f"Using default window size {w},{h}")
self.set_default_size(w, h) self.set_default_size(w, h)
def _on_delete_event( def _on_delete_event(self, window: "OuterWindow", event: Gdk.EventKey) -> None:
self, window: "OuterWindow", event: Gdk.EventKey
) -> None:
self.halt_proc_and_quit() self.halt_proc_and_quit()
def halt_proc_and_quit(self) -> None: def halt_proc_and_quit(self) -> None:
@ -1362,8 +1342,7 @@ class RightPanel(Gtk.Box):
self.pack_start(self.filters_vbox, False, False, 0) self.pack_start(self.filters_vbox, False, False, 0)
debug_tooltip = ( debug_tooltip = (
"Used to perform a dry run without\n" "Used to perform a dry run without\n" "actually connecting to a server"
"actually connecting to a server"
) )
ping_tooltip = ( ping_tooltip = (
"Refresh the ping for visible servers.\n" "Refresh the ping for visible servers.\n"
@ -1432,8 +1411,7 @@ class RightPanel(Gtk.Box):
rows = ModelManager.get_filtered() rows = ModelManager.get_filtered()
with ThreadPoolExecutor(100) as executor: with ThreadPoolExecutor(100) as executor:
futures = [ futures = [
executor.submit(Servers.ping, i, row) executor.submit(Servers.ping, i, row) for i, row in enumerate(rows)
for i, row in enumerate(rows)
] ]
wait(futures) wait(futures)
for future in futures: for future in futures:
@ -1809,9 +1787,7 @@ class ModelManagerSingleton:
class TreeView(Gtk.TreeView): class TreeView(Gtk.TreeView):
__gsignals__ = { __gsignals__ = {"on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())}
"on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())
}
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@ -1930,9 +1906,7 @@ class TreeView(Gtk.TreeView):
if self.current_proc and self.current_proc.is_alive(): if self.current_proc and self.current_proc.is_alive():
self.current_proc.terminate() self.current_proc.terminate()
def _delete_note( def _delete_note(self, button: Gtk.Button, user_entry: Gtk.Box, addr: str) -> None:
self, button: Gtk.Button, user_entry: Gtk.Box, addr: str
) -> None:
box = button.get_parent() box = button.get_parent()
dialog = box.get_parent() dialog = box.get_parent()
try: try:
@ -2024,9 +1998,7 @@ class TreeView(Gtk.TreeView):
model.remove(it) model.remove(it)
block_signals() block_signals()
thread = threading.Thread( thread = threading.Thread(target=ModelManager.resync_model, args=(addr, qport))
target=ModelManager.resync_model, args=(addr, qport)
)
thread.start() thread.start()
def remove_from_history(self) -> None: def remove_from_history(self) -> None:
@ -2050,16 +2022,12 @@ class TreeView(Gtk.TreeView):
if hasattr(TreeView, menu_item.action): if hasattr(TreeView, menu_item.action):
func = getattr(TreeView, menu_item.action) func = getattr(TreeView, menu_item.action)
msg = ( msg = (
f"User clicked context menu '{menu_item.get_label()}', " f"User clicked context menu '{menu_item.get_label()}', " f"calls {func}"
f"calls {func}"
) )
logger.info(msg) logger.info(msg)
func(self) func(self)
else: else:
msg = ( msg = f"Context menu function for '{menu_item.action}' " f"does not exist"
f"Context menu function for '{menu_item.action}' "
f"does not exist"
)
u_msg = ( u_msg = (
f"Something went wrong when accessing the method " f"Something went wrong when accessing the method "
f"'{menu_item.action}'" f"'{menu_item.action}'"
@ -2100,9 +2068,7 @@ class TreeView(Gtk.TreeView):
return True return True
return False return False
def _on_button_release( def _on_button_release(self, widget: Gtk.Widget, event: Gdk.EventButton) -> None:
self, widget: Gtk.Widget, event: Gdk.EventButton
) -> None:
if event.type is Gdk.EventType.BUTTON_RELEASE and event.button != 3: if event.type is Gdk.EventType.BUTTON_RELEASE and event.button != 3:
return return
@ -2186,9 +2152,7 @@ class TreeView(Gtk.TreeView):
if event.type is Gdk.EventType.KEY_PRESS and event.keyval is Gdk.KEY_l: if event.type is Gdk.EventType.KEY_PRESS and event.keyval is Gdk.KEY_l:
if self.is_selection_empty(): if self.is_selection_empty():
return return
self.menu.popup_at_widget( self.menu.popup_at_widget(widget, Gdk.Gravity.CENTER, Gdk.Gravity.WEST)
widget, Gdk.Gravity.CENTER, Gdk.Gravity.WEST
)
else: else:
self.menu.popup_at_pointer(event) self.menu.popup_at_pointer(event)
self.menu.select_first(False) self.menu.select_first(False)
@ -2202,9 +2166,7 @@ class TreeView(Gtk.TreeView):
return None return None
call_out("start_cooldown", "", "") call_out("start_cooldown", "", "")
thread = threading.Thread( thread = threading.Thread(target=self._background_player_count, args=())
target=self._background_player_count, args=()
)
thread.start() thread.start()
def get_current_iter(self) -> Gtk.TreeIter | None: def get_current_iter(self) -> Gtk.TreeIter | None:
@ -2219,9 +2181,7 @@ class TreeView(Gtk.TreeView):
context = App.treeview.get_subpage_label() context = App.treeview.get_subpage_label()
row_sel = self.get_value_at_index(0) row_sel = self.get_value_at_index(0)
logger.info( logger.info(f"Tree selection for context '{context}' changed to '{row_sel}'")
f"Tree selection for context '{context}' changed to '{row_sel}'"
)
if self.current_proc and self.current_proc.is_alive(): if self.current_proc and self.current_proc.is_alive():
self.current_proc.terminate() self.current_proc.terminate()
@ -2279,9 +2239,7 @@ class TreeView(Gtk.TreeView):
self.set_cursor(path) self.set_cursor(path)
return None return None
def _on_keypress( def _on_keypress(self, treeview: Gtk.TreeView, event: Gdk.EventKey) -> bool | None:
self, treeview: Gtk.TreeView, event: Gdk.EventKey
) -> bool | None:
keyname = Gdk.keyval_name(event.keyval) keyname = Gdk.keyval_name(event.keyval)
grid = App.grid grid = App.grid
if event.state is Gdk.ModifierType.CONTROL_MASK: if event.state is Gdk.ModifierType.CONTROL_MASK:
@ -2336,9 +2294,7 @@ class TreeView(Gtk.TreeView):
return False return False
return None return None
def _on_key_release( def _on_key_release(self, treeview: Gtk.TreeView, event: Gdk.EventKey) -> None:
self, treeview: Gtk.TreeView, event: Gdk.EventKey
) -> None:
""" """
Suppresses spamming on keydown Suppresses spamming on keydown
""" """
@ -2453,10 +2409,7 @@ class TreeView(Gtk.TreeView):
params = Servers.params params = Servers.params
serv = [] serv = []
with ThreadPoolExecutor() as executor: with ThreadPoolExecutor() as executor:
futures = [ futures = [executor.submit(job, key, APPID_DAYZ, param) for param in params]
executor.submit(job, key, APPID_DAYZ, param)
for param in params
]
wait(futures) wait(futures)
for future in futures: for future in futures:
res = future.result() res = future.result()
@ -2478,10 +2431,7 @@ class TreeView(Gtk.TreeView):
def _dump_lan(self, port: int) -> list | None: def _dump_lan(self, port: int) -> list | None:
with ThreadPoolExecutor() as executor: with ThreadPoolExecutor() as executor:
futures = [ futures = [executor.submit(Servers.test_ip, i, port) for i in range(1, 256)]
executor.submit(Servers.test_ip, i, port)
for i in range(1, 256)
]
wait(futures) wait(futures)
servers = [] servers = []
for future in futures: for future in futures:
@ -2501,7 +2451,7 @@ class TreeView(Gtk.TreeView):
if len(ips) == 0: if len(ips) == 0:
return [] return []
# NOTE: block malformed records # NOTE: block malformed records
ips = [ip for ip in ips if len(ip.split(":")) == 3 and ip.split(":")[2] != "" ] ips = [ip for ip in ips if len(ip.split(":")) == 3 and ip.split(":")[2] != ""]
with ThreadPoolExecutor() as executor: with ThreadPoolExecutor() as executor:
futures = [ futures = [
executor.submit( executor.submit(
@ -2606,9 +2556,7 @@ class TreeView(Gtk.TreeView):
ModelManager.set_store(App.treeview.get_model()) ModelManager.set_store(App.treeview.get_model())
App.treeview.set_model(None) App.treeview.set_model(None)
thread = threading.Thread( thread = threading.Thread(target=ModelManager.filter, args=(mode, *args))
target=ModelManager.filter, args=(mode, *args)
)
thread.start() thread.start()
def _background_quad(self, dialog: "GenericDialog", mode: RowType) -> None: def _background_quad(self, dialog: "GenericDialog", mode: RowType) -> None:
@ -2767,13 +2715,9 @@ class TreeView(Gtk.TreeView):
self.initialize_columns() self.initialize_columns()
self.set_selection_mode(Gtk.SelectionMode.SINGLE) self.set_selection_mode(Gtk.SelectionMode.SINGLE)
self.wait_dialog = GenericDialog( self.wait_dialog = GenericDialog("Fetching server metadata", Popup.WAIT)
"Fetching server metadata", Popup.WAIT
)
self.wait_dialog.show_all() self.wait_dialog.show_all()
thread = threading.Thread( thread = threading.Thread(target=self._query_servers, args=(mode, port))
target=self._query_servers, args=(mode, port)
)
thread.start() thread.start()
def _format_float( def _format_float(
@ -2952,9 +2896,7 @@ class TreeView(Gtk.TreeView):
def get_view(self): def get_view(self):
return self.view return self.view
def get_prereqs( def get_prereqs(self, record: Record) -> tuple[bool, str, str | None, "Prereqs"]:
self, record: Record
) -> tuple[bool, str, str|None, "Prereqs"]:
""" """
Always called on a thread with a dialog on the transient parent window Always called on a thread with a dialog on the transient parent window
""" """
@ -2968,18 +2910,14 @@ class TreeView(Gtk.TreeView):
steam_path = query_config("default_steam_path")[0] steam_path = query_config("default_steam_path")[0]
if len(steam_path) < 1: if len(steam_path) < 1:
logger.critical( logger.critical("Config file has no value set for 'default_steam_path'")
"Config file has no value set for 'default_steam_path'"
)
msg = "Local Steam installation is not set, possibly malformed config file." msg = "Local Steam installation is not set, possibly malformed config file."
return (False, msg, None, prereqs) return (False, msg, None, prereqs)
try: try:
pefile_path = PeFile.get_pefile_path(steam_path, prereqs.appid) pefile_path = PeFile.get_pefile_path(steam_path, prereqs.appid)
except AppNotInstalledError: except AppNotInstalledError:
logger.critical( logger.critical(f"'{prereqs.appid}' not found in user's libraryfolders")
f"'{prereqs.appid}' not found in user's libraryfolders"
)
msg = ( msg = (
f"This server is running {build}. You can install " f"This server is running {build}. You can install "
f"{build} by searching for it in your Steam library. " f"{build} by searching for it in your Steam library. "
@ -2988,9 +2926,7 @@ class TreeView(Gtk.TreeView):
) )
return (False, msg, None, prereqs) return (False, msg, None, prereqs)
except AppMovedError: except AppMovedError:
logger.critical( logger.critical(f"Library folder synch error for '{prereqs.appid}'")
f"Library folder synch error for '{prereqs.appid}'"
)
msg = ( msg = (
f"Steam is reporting that {build} is installed at a non-existent location. " f"Steam is reporting that {build} is installed at a non-existent location. "
f"If you recently installed {build} or moved it to a different drive, " f"If you recently installed {build} or moved it to a different drive, "
@ -3045,7 +2981,6 @@ class TreeView(Gtk.TreeView):
return (True, "", pefile_path, prereqs) return (True, "", pefile_path, prereqs)
@signal_emission @signal_emission
@update_window_labels @update_window_labels
def _on_row_activated( def _on_row_activated(
@ -3199,7 +3134,7 @@ class GenericDialog(Gtk.MessageDialog):
self.outer.set_margin_end(30) self.outer.set_margin_end(30)
def _on_dialog_delete( def _on_dialog_delete(
self, response_id: Gtk.ResponseType, event: Gdk.Event self, response_id: Gtk.ResponseType, event: Gdk.Event
) -> Literal[True]: ) -> Literal[True]:
""" """
Prevent manual dialog destruction Prevent manual dialog destruction
@ -3278,9 +3213,7 @@ class LanDialog(Gtk.MessageDialog):
self.connect("delete-event", self.restore_context) self.connect("delete-event", self.restore_context)
self.entry.connect("insert-text", self._on_text_typed) self.entry.connect("insert-text", self._on_text_typed)
self.entry.get_property("buffer").connect( self.entry.get_property("buffer").connect("deleted-text", self._on_text_deleted)
"deleted-text", self._on_text_deleted
)
def _validate(self, text: str) -> None: def _validate(self, text: str) -> None:
if self._is_invalid(text): if self._is_invalid(text):
@ -3396,9 +3329,7 @@ class DetailsDialog(GenericDialog):
for i, column_title in enumerate(["Item", "Details"]): for i, column_title in enumerate(["Item", "Details"]):
renderer = Gtk.CellRendererText(xalign=0) renderer = Gtk.CellRendererText(xalign=0)
if i == 0: if i == 0:
column = Gtk.TreeViewColumn( column = Gtk.TreeViewColumn(column_title, renderer, text=i, weight=2)
column_title, renderer, text=i, weight=2
)
else: else:
column = Gtk.TreeViewColumn(column_title, renderer, text=i) column = Gtk.TreeViewColumn(column_title, renderer, text=i)
column.set_sizing(Gtk.TreeViewColumnSizing.FIXED) column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
@ -3414,12 +3345,8 @@ class DetailsDialog(GenericDialog):
scrollable_message = Gtk.ScrolledWindow() scrollable_message = Gtk.ScrolledWindow()
desc = Gtk.Label(label="Server message", valign=Gtk.Align.START) desc = Gtk.Label(label="Server message", valign=Gtk.Align.START)
add_class(desc, "details-heading") add_class(desc, "details-heading")
box = Gtk.Box( box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER)
orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER self.description = Gtk.Label(justify=Gtk.Justification.CENTER, wrap=True)
)
self.description = Gtk.Label(
justify=Gtk.Justification.CENTER, wrap=True
)
sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL) sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
sep.set_margin_bottom(10) sep.set_margin_bottom(10)
for el in desc, sep, self.description: for el in desc, sep, self.description:
@ -3457,9 +3384,7 @@ class DetailsDialog(GenericDialog):
self.run() self.run()
self.destroy() self.destroy()
def _background( def _background(self, dialog: "GenericDialog", ip: str, qport: int) -> None:
self, dialog: "GenericDialog", ip: str, qport: int
) -> None:
response = Servers.details(self.ip, self.qport) response = Servers.details(self.ip, self.qport)
if response.success: if response.success:
for row in response.data: for row in response.data:
@ -3516,9 +3441,7 @@ class ModDialog(GenericDialog):
wait_dialog = GenericDialog("Fetching modlist", Popup.WAIT) wait_dialog = GenericDialog("Fetching modlist", Popup.WAIT)
wait_dialog.show_all() wait_dialog.show_all()
thread = threading.Thread( thread = threading.Thread(target=self._background, args=(wait_dialog, record))
target=self._background, args=(wait_dialog, record)
)
thread.start() thread.start()
def _background(self, dialog: "GenericDialog", record: str) -> None: def _background(self, dialog: "GenericDialog", record: str) -> None:
@ -3543,9 +3466,7 @@ class ModDialog(GenericDialog):
self.view.set_model(modlist_store) self.view.set_model(modlist_store)
GLib.idle_add(_load) GLib.idle_add(_load)
def _parse_modlist_rows( def _parse_modlist_rows(self, data: subprocess.CompletedProcess) -> bool | int:
self, data: subprocess.CompletedProcess
) -> bool | int:
lines = data.stdout.splitlines() lines = data.stdout.splitlines()
hits = len(lines) hits = len(lines)
reader = csv.reader(lines, delimiter=delimiter) reader = csv.reader(lines, delimiter=delimiter)
@ -3575,9 +3496,7 @@ class ModDialog(GenericDialog):
class LinkDialog(GenericDialog): class LinkDialog(GenericDialog):
def __init__( def __init__(self, text: str, link: str | None, command: RowType, uid: str = ""):
self, text: str, link: str | None, command: RowType, uid: str = ""
):
super().__init__(text, Popup.NOTIFY) super().__init__(text, Popup.NOTIFY)
text = textwrap.dedent(text) text = textwrap.dedent(text)
@ -3795,7 +3714,12 @@ class Options(Gtk.Box):
client_store = Gtk.ListStore(str, str) client_store = Gtk.ListStore(str, str)
client_store.append(["steam", "steam"]) client_store.append(["steam", "steam"])
client_store.append(["flatpak", "flatpak run com.valvesoftware.Steam"]) client_store.append(["flatpak", "flatpak run com.valvesoftware.Steam"])
client_store.append(["flatpak (container)", "flatpak-spawn --host flatpak run com.valvesoftware.Steam"]) client_store.append(
[
"flatpak (container)",
"flatpak-spawn --host flatpak run com.valvesoftware.Steam",
]
)
renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END) renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END)
self.client_combo = Gtk.ComboBox.new_with_model(client_store) self.client_combo = Gtk.ComboBox.new_with_model(client_store)
@ -3819,8 +3743,7 @@ class Options(Gtk.Box):
self.force_button.set_sensitive(False) self.force_button.set_sensitive(False)
msg = ( msg = (
"Manual: prompt to subscribe to mods in Steam. " "Manual: prompt to subscribe to mods in Steam. " "Auto: unmanned downloads."
"Auto: unmanned downloads."
) )
eb = InfoEventBox(msg) eb = InfoEventBox(msg)
@ -3879,9 +3802,7 @@ class Options(Gtk.Box):
self.make_frame(mods_grid, "Mods"), self.make_frame(mods_grid, "Mods"),
self.make_frame(version_grid, "Version"), self.make_frame(version_grid, "Version"),
]: ]:
grid.attach( grid.attach(frame, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT)
frame, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT
)
row += 1 row += 1
self.scrollable = Gtk.ScrolledWindow(vexpand=True) self.scrollable = Gtk.ScrolledWindow(vexpand=True)
@ -3927,9 +3848,7 @@ class Options(Gtk.Box):
return box return box
def _on_field_activated( def _on_field_activated(self, entry: Gtk.Entry, context: Preferences) -> None:
self, entry: Gtk.Entry, context: Preferences
) -> None:
text = entry.get_text() text = entry.get_text()
button = entry.sibling button = entry.sibling
if not self._is_valid_text(text, context): if not self._is_valid_text(text, context):
@ -3950,9 +3869,7 @@ class Options(Gtk.Box):
for record in rows: for record in rows:
col = 1 col = 1
for el in record: for el in record:
grid.attach( grid.attach(el, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT)
el, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT
)
col += 1 col += 1
row += 1 row += 1
return grid return grid
@ -4005,9 +3922,7 @@ class Options(Gtk.Box):
return return
process_toggle(RowType.TGL_BRANCH) process_toggle(RowType.TGL_BRANCH)
def _on_radio_toggled( def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
self, button: Gtk.RadioButton, context: Preferences
) -> None:
if App.treeview.subpage is not RowType.OPTIONS: if App.treeview.subpage is not RowType.OPTIONS:
return return
match context: match context:
@ -4151,18 +4066,14 @@ class Options(Gtk.Box):
field[1].get_children()[1].set_sensitive(False) field[1].get_children()[1].set_sensitive(False)
try: try:
pe_file_path = PeFile.get_pefile_path( pe_file_path = PeFile.get_pefile_path(default_steam_path, APPID_DAYZ)
default_steam_path, APPID_DAYZ
)
vers = PeFile.get_dayz_version(pe_file_path) vers = PeFile.get_dayz_version(pe_file_path)
dayz_version = PeFile.dayz_version_to_str(vers) dayz_version = PeFile.dayz_version_to_str(vers)
except Exception: except Exception:
dayz_version = "-" dayz_version = "-"
try: try:
exp_file_path = PeFile.get_pefile_path( exp_file_path = PeFile.get_pefile_path(default_steam_path, APPID_DAYZ_EXP)
default_steam_path, APPID_DAYZ_EXP
)
vers = PeFile.get_dayz_version(exp_file_path) vers = PeFile.get_dayz_version(exp_file_path)
dayz_exp_version = PeFile.dayz_version_to_str(vers) dayz_exp_version = PeFile.dayz_version_to_str(vers)
except Exception: except Exception:
@ -4271,9 +4182,7 @@ class KeybindingsDialog(Gtk.Box):
if not sep: if not sep:
grid.attach(desc, col, row, w, h) grid.attach(desc, col, row, w, h)
else: else:
grid.attach_next_to( grid.attach_next_to(desc, sep, Gtk.PositionType.BOTTOM, w, h)
desc, sep, Gtk.PositionType.BOTTOM, w, h
)
row += 1 row += 1
sep = None sep = None
grid.attach_next_to(frame, desc, Gtk.PositionType.RIGHT, w, h) grid.attach_next_to(frame, desc, Gtk.PositionType.RIGHT, w, h)
@ -4281,9 +4190,7 @@ class KeybindingsDialog(Gtk.Box):
l_spacer = Gtk.Label(label="") l_spacer = Gtk.Label(label="")
r_spacer = Gtk.Label(label="") r_spacer = Gtk.Label(label="")
grid.attach(l_spacer, col, row + 1, w, h) grid.attach(l_spacer, col, row + 1, w, h)
grid.attach_next_to( grid.attach_next_to(r_spacer, l_spacer, Gtk.PositionType.RIGHT, w, h)
r_spacer, l_spacer, Gtk.PositionType.RIGHT, w, h
)
row += 1 row += 1
return grid return grid
@ -4292,9 +4199,7 @@ class KeybindingsDialog(Gtk.Box):
col = 0 col = 0
w = 1 w = 1
h = 1 h = 1
sidebar = Gtk.Grid( sidebar = Gtk.Grid(row_homogeneous=True, orientation=Gtk.Orientation.VERTICAL)
row_homogeneous=True, orientation=Gtk.Orientation.VERTICAL
)
for cat in categories: for cat in categories:
label = Gtk.Label(label=cat) label = Gtk.Label(label=cat)
add_class(label, "left-label") add_class(label, "left-label")
@ -4314,9 +4219,7 @@ class KeybindingsDialog(Gtk.Box):
column = 1 column = 1
w = 1 w = 1
h = 1 h = 1
sidebar = self.build_sidebar( sidebar = self.build_sidebar(["Servers", "Navigation", "Vim-style keys"])
["Servers", "Navigation", "Vim-style keys"]
)
separator = Gtk.Separator() separator = Gtk.Separator()
keys_box = self.build_keys(items) keys_box = self.build_keys(items)
@ -4534,9 +4437,7 @@ class Statusbar(Gtk.Statusbar):
players_pretty = pluralize("players", players) players_pretty = pluralize("players", players)
hits_pretty = pluralize("matches", hits) hits_pretty = pluralize("matches", hits)
formatted = ( formatted = f"Found {hits:n} {hits_pretty} with {players:n} {players_pretty}"
f"Found {hits:n} {hits_pretty} with {players:n} {players_pretty}"
)
suffix = "| Distance: calculating..." suffix = "| Distance: calculating..."
if players == 0: if players == 0:
@ -4588,9 +4489,7 @@ class Grid(Gtk.Grid):
self.breadcrumbs = Gtk.Label(label="Main menu", halign=Gtk.Align.START) self.breadcrumbs = Gtk.Label(label="Main menu", halign=Gtk.Align.START)
self.attach(self.notebook, 0, 0, 3, 1) self.attach(self.notebook, 0, 0, 3, 1)
self.attach_next_to( self.attach_next_to(self.breadcrumbs, self.notebook, Gtk.PositionType.TOP, 3, 1)
self.breadcrumbs, self.notebook, Gtk.PositionType.TOP, 3, 1
)
self.attach_next_to( self.attach_next_to(
self.statusbar, self.notebook, Gtk.PositionType.BOTTOM, 3, 1 self.statusbar, self.notebook, Gtk.PositionType.BOTTOM, 3, 1
) )
@ -4652,11 +4551,23 @@ class App(Gtk.Application):
) )
self.win.add_accel_group(accel) self.win.add_accel_group(accel)
GLibUnix.signal_add_full( self.setup_signals()
GLib.PRIORITY_DEFAULT, signal.SIGINT, self._catch_sigint
)
Gtk.main() Gtk.main()
def setup_signals(self) -> None:
SIGNAL_ADD = "signal_add"
SIGNAL_ADD_FULL = "signal_add_full"
try:
if SIGNAL_ADD in dir(GLibUnix):
func = GLibUnix.signal_add
elif SIGNAL_ADD_FULL in dir(GLibUnix):
func = GLibUnix.signal_add_full
else:
func = GLib.unix_signal_add
func(GLib.PRIORITY_DEFAULT, signal.SIGINT, self._catch_sigint)
except Exception as e:
logger.critical(e)
def _catch_sigint(self) -> None: def _catch_sigint(self) -> None:
self.win.halt_proc_and_quit() self.win.halt_proc_and_quit()
@ -4741,9 +4652,7 @@ class ModSelectionPanel(Gtk.Box):
def toggle_select_stale_button(self, state: bool) -> None: def toggle_select_stale_button(self, state: bool) -> None:
if state: if state:
button = Gtk.Button( button = Gtk.Button(label="Select stale", margin_start=10, margin_end=10)
label="Select stale", margin_start=10, margin_end=10
)
text = "Bulk selects all currently highlighted mods" text = "Bulk selects all currently highlighted mods"
button.set_tooltip_text(text) button.set_tooltip_text(text)
button.connect("clicked", self._on_button_clicked) button.connect("clicked", self._on_button_clicked)
@ -4863,9 +4772,7 @@ class FilterPanel(Gtk.Box):
self.keyword_entry = Gtk.Entry() self.keyword_entry = Gtk.Entry()
self.keyword_entry.set_placeholder_text("Filter by keyword") self.keyword_entry.set_placeholder_text("Filter by keyword")
self.keyword_entry.connect("activate", self._on_keyword_enter) self.keyword_entry.connect("activate", self._on_keyword_enter)
self.keyword_entry.connect( self.keyword_entry.connect("key-press-event", self._on_keyword_keypress)
"key-press-event", self._on_keyword_keypress
)
completion = Gtk.EntryCompletion(inline_completion=True) completion = Gtk.EntryCompletion(inline_completion=True)
completion.set_text_column(0) completion.set_text_column(0)
@ -4933,9 +4840,7 @@ class FilterPanel(Gtk.Box):
state = self.default_filters[label] state = self.default_filters[label]
check.set_active(state) check.set_active(state)
def _on_map_entry_keypress( def _on_map_entry_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> None:
self, entry: Gtk.Entry, event: Gdk.EventKey
) -> None:
match event.keyval: match event.keyval:
case Gdk.KEY_Return: case Gdk.KEY_Return:
text = entry.get_text() text = entry.get_text()
@ -4978,9 +4883,7 @@ class FilterPanel(Gtk.Box):
App.treeview.grab_focus() App.treeview.grab_focus()
return False return False
def _on_keyword_keypress( def _on_keyword_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> bool:
self, entry: Gtk.Entry, event: Gdk.EventKey
) -> bool:
match event.keyval: match event.keyval:
case Gdk.KEY_Up: case Gdk.KEY_Up:
return True return True
@ -4991,9 +4894,7 @@ class FilterPanel(Gtk.Box):
return True return True
return False return False
def _on_combo_keypress( def _on_combo_keypress(self, combo: Gtk.ComboBox, event: Gdk.EventKey) -> bool:
self, combo: Gtk.ComboBox, event: Gdk.EventKey
) -> bool:
match event.keyval: match event.keyval:
case Gdk.KEY_Down: case Gdk.KEY_Down:
self.maps_combo.popup() self.maps_combo.popup()