From d92a0010e2483f075711e2274552d3dafddd2bd2 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sun, 19 Apr 2026 20:42:36 +0900 Subject: [PATCH] chore: clean up unused methods --- dzgui/api/servers.py | 4 +++- dzgui/controllers/mc.py | 33 ++------------------------- dzgui/model/servers.py | 9 +------- dzgui/views/components/right_panel.py | 25 -------------------- 4 files changed, 6 insertions(+), 65 deletions(-) diff --git a/dzgui/api/servers.py b/dzgui/api/servers.py index 0061dee..9c728da 100644 --- a/dzgui/api/servers.py +++ b/dzgui/api/servers.py @@ -443,8 +443,10 @@ def response_to_fq_ip(res: dict) -> str: return f"{ip}:{gameport}:{qport}" -# NOTE: Battlemetrics def query_by_id(addr: str, key: str) -> Optional[dict]: + """ + Used with numeric Battlemetrics IDs + """ try: resolved = map_id_to_record(key, addr) return query_direct(resolved.ip, resolved.qport) diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 47a0d0e..8838770 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -5,7 +5,7 @@ import threading from functools import wraps from pathlib import Path -from typing import Any, Callable, Union, TYPE_CHECKING +from typing import Any, Callable, TYPE_CHECKING from warnings import deprecated import dzgui.api.pefile as PeFile @@ -160,34 +160,6 @@ class Controller(GObject.GObject): def is_auto_install(self) -> bool: return self.query_config(Preferences.INSTALL) - # def unblock_signals(self) -> None: - # self.block_signals(False) - - # @deprecated("Currently unused") - # def block_signals(self, state: bool = True) -> None: - # self.suppress_signal( - # self.mediator.filters, - # self.mediator.filters.maps_combo, - # "_on_map_changed", - # state, - # ) - # self.suppress_signal( - # self.mediator.menu, - # self.mediator.menu.selected_row, - # "_on_tree_selection_changed", - # state, - # ) - # self.suppress_signal( - # self.mediator.menu, self.mediator.menu, "_on_keypress", state - # ) - # for check in self.mediator.filters.checks: - # self.suppress_signal( - # self.mediator.filters, - # check, - # "_on_check_toggled", - # state, - # ) - def suppress_signal( self, owner: Gtk.Widget, widget: Gtk.Widget, func_name: str, state: bool ) -> None: @@ -199,7 +171,6 @@ class Controller(GObject.GObject): widget.handler_unblock_by_func(func) def toggle_debug_mode(self) -> None: - # self.config_man().toggle_config(Preferences.DEBUG) self.toggle_config(Preferences.DEBUG) def get_active_context(self) -> Gtk.TreeView: @@ -211,7 +182,6 @@ class Controller(GObject.GObject): def grab_active_treeview(self) -> None: self.get_active_treeview().grab_focus() - # TODO: resolution manager or config manager def save_res_and_quit(self, *args: Any) -> None: treeview = self.get_active_treeview() window = self.get_window() @@ -223,6 +193,7 @@ class Controller(GObject.GObject): self.mediator.statusbar.statusbar.pop(c) # TODO: refactor any modules using this + # cf. eventbox.py @deprecated("use set_by_context") def set_statusbar(self, text: str, context: str) -> int: msg_id = self.mediator.statusbar.set_text(text, context) diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py index 447bb62..f8275a5 100644 --- a/dzgui/model/servers.py +++ b/dzgui/model/servers.py @@ -194,8 +194,6 @@ class ServerModelManager: parsed = Servers.parse_json(servers) self._push_data(parsed) - # TODO: add cleanup? - # FIXME: use "adding server" string @call_on_thread(dialog.querying) def add_by_id(self, addr: str) -> None: config_man = self.controller.get_config_man() @@ -203,19 +201,15 @@ class ServerModelManager: res = Servers.query_by_id(addr, key) self._parse_single_record(res) - # TODO: add cleanup? - # FIXME: use "adding server" string @call_on_thread(dialog.querying) def add_by_ip(self, addr: str) -> None: res = Servers.query_by_ip(addr) self._parse_single_record(res) - # TODO: add cleanup? - # FIXME: use "adding server" string @call_on_thread(dialog.querying) def add_by_record(self, record: Servers.Record) -> None: """ - Record as shown in server browser may resolve to a different IP + Rationale: a Record as shown in server browser may resolve to a different IP """ res = Servers.query_by_record(record) self._parse_single_record(res) @@ -235,7 +229,6 @@ class ServerModelManager: def update_playercount( self, treeiter: Gtk.TreeIter, record: Servers.Record ) -> None: - proxy_man = self._get_proxy_man() res = Servers.query_playercount(record) if res is None: return diff --git a/dzgui/views/components/right_panel.py b/dzgui/views/components/right_panel.py index 47f0ad6..9901e6a 100644 --- a/dzgui/views/components/right_panel.py +++ b/dzgui/views/components/right_panel.py @@ -74,28 +74,3 @@ class RightPanel(Gtk.Box): self.version_label.set_text("Copied!") copy_clipboard(version) GLib.timeout_add_seconds(0.5, revert) - - # TODO: reference for ping pass - # def _on_ping_clicked(self, button: Gtk.Button) -> None: - # block_signals() - # def _update_pings(): - # rows = ModelManager.get_filtered() - # with ThreadPoolExecutor(100) as executor: - # futures = [ - # executor.submit(Servers.ping, i, row) - # for i, row in enumerate(rows) - # ] - # wait(futures) - # for future in futures: - # res = future.result() - # path = Gtk.TreePath.new_from_indices([res.iteration]) - # temp_model[path][9] = res.ping - # ModelManager.ping_cache[res.addr] = res.ping - # treeview.set_model(temp_model) - # treeview.wait_dialog.destroy() - # treeview.grab_focus() - # unblock_signals() - # temp_model = self.AppNav.treeview.get_model() - # treeview.set_model(None) - # thread = threading.Thread(target=_update_pings, args=()) - # thread.start()