Merge pull request #499 from aclist/fix/vdf-missing

fix: missing shortcuts file

dzgui/api/shortcuts.py

@@ -10,8 +10,8 @@ from pathlib import Path
 from typing import Any
 
 from dzgui.api.steam import find_user_id_32
-from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, IMAGES_PATH
-from dzgui.util.dirs import copy_dzgui_to_xdg_data
+from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, GTK_APP_ID, IMAGES_PATH
+from dzgui.util.dirs import copy_dzgui_to_xdg_data, make_parents
 from dzgui.util.strings import unknown
 
 logger = logging.getLogger(APP_NAME)
@@ -75,6 +75,8 @@ class Shortcuts:
                 shortcuts = vdf.binary_load(f)
             self.shortcuts = shortcuts
             logger.debug("Loaded shortcuts file")
+        except FileNotFoundError:
+            self.shortcuts = {"shortcuts": {}}
         except Exception as e:
             logger.critical(e)
             raise e
@@ -109,6 +111,7 @@ class Shortcuts:
         for img in ("_hero", "p", "_logo"):
             filename = str(self.bpid) + img
             dest = grid_path.joinpath(filename).with_suffix(".png")
+            make_parents(dest)
             b = images.joinpath(img).with_suffix(".png").read_bytes()
             dest.write_bytes(b)
 
@@ -155,7 +158,8 @@ class Shortcuts:
         NEW_ENTRY["DevkitGameID"] = ""
         NEW_ENTRY["DevkitOverrideAppID"] = 0
         NEW_ENTRY["LastPlayTime"] = 0
-        NEW_ENTRY["FlatpakAppID"] = ""
+        NEW_ENTRY["FlatpakAppID"] = GTK_APP_ID
+
         NEW_ENTRY["sortas"] = ""
         NEW_ENTRY["tags"] = {}
         return NEW_ENTRY
@@ -172,6 +176,9 @@ class Shortcuts:
         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)
         except Exception as e:

dzgui/controllers/emitter.py

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

@@ -17,10 +17,3 @@ fullscreen_eventbox = "This option is not available on Steam Deck."
 save_button = "Save"
 
 api_failed = "API validation failed"
-
-flatpak_label = "Flatpak client"
-flatpak_standard = "Standard"
-flatpak_container = "Containerized (flatpak-spawn --host)"
-flatpak_info = (
-    "Containerized mode is used on certain distributions. May have side effects."
-)

dzgui/strings/wizard.py

@@ -70,8 +70,7 @@ checkbox_steam_shortcut = (
     (
         "This creates a standalone copy of DZGUI and adds it to Steam. "
         "You <b>must restart Steam</b> for the shortcut to appear. This will not replace or update existing shortcuts. "
-        "If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version. "
-        "Not available if you selected the Flatpak client as your Steam default."
+        "If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version."
     ),
 )
 checkbox_start_menu = (

dzgui/views/components/buttons.py

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

dzgui/views/dialogs/wizard.py

@@ -12,7 +12,6 @@ from dzgui.const.constants import (
     APP_NAME,
     APP_NAME_LOWER,
     HERO_PATH,
-    FLATPAK_STEAM_PATH,
     LEGACY_CONFIG_PATH,
 )
 from dzgui.const.boilerplate import config_boilerplate
@@ -625,12 +624,6 @@ class ShortcutCreationPage(OptionalPageMixin, EnumeratedWizardPage):  # type: ig
         self.add_start(self.checks_area)
         self.show_all()
         self.connect("map", self._on_map)
-        self.connect("map", self._toggle_checkbox)
-
-    def _toggle_checkbox(self, page: "EnumeratedWizardPage") -> None:
-        if FLATPAK_STEAM_PATH in str(self.steam_path):
-            self.steam_checkbox.set_active(False)
-            self.steam_checkbox.set_sensitive(False)
 
     def _on_start_menu_toggled(self, button: Gtk.CheckButton) -> None:
         state = button.get_active()

dzgui/views/pages/options.py

@@ -9,9 +9,6 @@ from dzgui.const.constants import (
     APPID_DAYZ_EXP,
     APPNAME_DAYZ,
     APPNAME_DAYZ_EXP_HUMAN,
-    FLATPAK_RUN_CMD,
-    FLATPAK_SANDBOX,
-    FLATPAK_STEAM_PATH,
     NO_EXPAND,
     NO_FILL,
     NO_PADDING,
@@ -249,27 +246,6 @@ class ToggleField(Gtk.Box):
             el.set_sensitive(state)
 
 
-class FlatpakToggleField(ToggleField):
-    def __init__(
-        self,
-        controller: "Controller",
-    ) -> None:
-        super().__init__(
-            controller,
-            first_option=options.flatpak_standard,
-            second_option=options.flatpak_container,
-            context=Preferences.CLIENT,
-        )
-        self.add(InfoEventBox(options.flatpak_info, self.controller))
-        self.controller = controller
-        self.radio1.connect("toggled", self._on_radio_toggled, Preferences.CLIENT)
-
-    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)
-
-
 class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
     def __init__(self, controller: "Controller"):
         super().__init__(
@@ -298,7 +274,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
         self.player_box.set_halign(Gtk.Align.START)
         self.player_box.get_children()[0].set_width_chars(30)  # type: ignore
 
-        self.flatpak_toggle = FlatpakToggleField(self.controller)
         self.fullscreen_toggle = ToggleField(
             self.controller,
             strings.options.last_used,
@@ -334,12 +309,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow):  # type: ignore
             [LeftLabel(options.start_tab), start_tab_hbox],
             [LeftLabel(strings.options.name), self.player_box],
         ]
-        default = self.controller.query_config(Preferences.DEFAULT)
-        if FLATPAK_STEAM_PATH in default:
-            pref_rows.insert(
-                0,
-                [LeftLabel(options.flatpak_label), self.flatpak_toggle],
-            )
 
         self.dayz_version_label = Gtk.Label(label=strings.null)
         self.dayz_exp_version_label = Gtk.Label(label=strings.null)

tests/test_process_detection.py

@@ -6,6 +6,7 @@ from dzgui.const.constants import (
     FLATPAK_ROOT_PATH,
     FLATPAK_RUN_CMD,
     FLATPAK_SANDBOX,
+    STEAM_CMD,
 )
 from dzgui.init import proc