just check once on startup for running

Author: mastercoms

tc2_launcher/__main__.py

@@ -8,6 +8,7 @@
 
 from tc2_launcher.gui import start_gui
 from tc2_launcher.run import (
+    DEV_INSTANCE,
     clean_self_update,
     default_dest_dir,
     launch_game,
@@ -53,7 +54,7 @@ def main():
 
         launch_gui = len(sys.argv) == 3
     else:
-        if update_self(version):
+        if not DEV_INSTANCE and update_self(version):
             sys.exit(0)
             return
 

tc2_launcher/gui.py

@@ -6,6 +6,7 @@
 import webview
 
 from tc2_launcher.run import (
+    DEV_INSTANCE,
     change_install_folder,
     get_launch_options,
     launch_game,
@@ -80,8 +81,8 @@ def on_game_exit():
     update_and_notify(window)
 
 
-def check_launch_game():
-    pid = wait_game_running()
+def check_launch_game(time_limit: float = 0):
+    pid = wait_game_running(time_limit)
     has_pid = pid is not None
     res = 2 if has_pid else 0
     get_window().evaluate_js(f"setLaunchState({res});")
@@ -93,11 +94,10 @@ def check_launch_game():
 
 
 def on_loaded(window):
-    if not check_launch_game():
+    if not check_launch_game(-1):
         update_and_notify(window)
 
 
-debug = not getattr(sys, "frozen", False)
 entry_path = get_entrypoint()
 entry = str(entry_path)
 entry_parent = entry_path.parent
@@ -113,7 +113,7 @@ def start_gui():
         window.state.opts = extra_options_str
         window.events.loaded += lambda: on_loaded(window)
         try:
-            webview.start(icon=str(entry_parent / "favicon.ico"), debug=debug)
+            webview.start(icon=str(entry_parent / "favicon.ico"), debug=DEV_INSTANCE)
         except Exception as e:
             if os.name == "posix" and sys.platform != "darwin":
                 subprocess.run(

tc2_launcher/run.py

@@ -17,6 +17,8 @@
 TC2_REPO = "mastercomfig/tc2"
 LAUNCHER_REPO = "mastercomfig/tc2-launcher"
 
+DEV_INSTANCE = not getattr(sys, "frozen", False)
+
 
 def default_dest_dir() -> Path:
     if sys.platform == "darwin":
@@ -414,15 +416,24 @@ def wait_game_exit(pid, callback):
     wait_game_exit_thread.start()
 
 
-def wait_game_running() -> int | None:
+DEFAULT_TIME_LIMIT = 5
+
+
+def wait_game_running(time_limit: float = DEFAULT_TIME_LIMIT) -> int | None:
     game_exe_name = _get_game_exe_name(running_process=True)
-    time_limit = 5
+    interval = 0.2
+    if time_limit == 0:
+        time_limit = DEFAULT_TIME_LIMIT
+    elif time_limit < 0:
+        time_limit = interval
     while time_limit > 0:
         for p in psutil.process_iter(["pid", "name"]):
             if p.info["name"] == game_exe_name:
                 return p.pid
+        if time_limit <= interval:
+            break
         before = timer()
-        sleep(0.2)
+        sleep(interval)
         time_limit -= timer() - before
     return None