fix: allow using refresh button after timeout events (#484)

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/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/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/pages/options.py

@@ -266,6 +266,7 @@ class FlatpakToggleField(ToggleField):
 
     def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
         cmd = FLATPAK_RUN_CMD if self.radio1.get_active() else FLATPAK_SANDBOX
+        print(context)
         self.controller.update_config(context, cmd)
 
 

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