Merge pull request #389 from aclist/fix/defer-import

fix: defer flock action until GUI is loaded

dzgui/app_init.py

@@ -13,6 +13,7 @@ from dzgui.init.migrate import (
     copy_state_files,
     migrate_cols_file,
 )
+from dzgui.init.flock import lock_acquire
 from dzgui.init.prereqs import has_steam_client
 from dzgui.strings import boot
 
@@ -31,10 +32,12 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(APP_NAME)
 
+
 # TODO: profile load time
 def make_parents(path: "Path") -> None:
     path.parent.mkdir(parents=True, exist_ok=True)
 
+
 def setup_logger(log_path: "Path") -> None:
     _format = (
         "%(asctime)s␞%(levelname)s␞%(filename)s::%(funcName)s::%(lineno)s␞%(message)s"
@@ -46,7 +49,10 @@ def setup_logger(log_path: "Path") -> None:
     logger.setLevel(logging.DEBUG)
     logger.addHandler(fh)
 
+
 def load_gui(version: str, is_debug: bool) -> None:
+    lock = lock_acquire()  # noqa
+
     set_locale()
     # NOTE: consider aborting this check if steam deck
     xdg_paths = get_xdg_paths()

dzgui/main.py

@@ -3,7 +3,6 @@ import sys
 import warnings
 
 from dzgui.const.constants import APP_NAME
-from dzgui.init.flock import lock_acquire
 from dzgui.init.libgi import test_libgi_missing
 from dzgui.init.prefix import get_version
 from dzgui.util.strings import flags
@@ -25,8 +24,6 @@ def uninstall() -> None:
 
 
 def main() -> None:
-    lock = lock_acquire()  # noqa
-
     if args.version is True:
         print(get_version())
         sys.exit(0)

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b13"
+version = "7.0.0b14"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"