state improvements and check for running

Author: mastercoms

gui/index.html

@@ -66,7 +66,7 @@
         }
 
         .logo {
-            width: min(70vw, 600px);
+            width: min(70vw, 400px);
             height: auto;
         }
 
@@ -148,7 +148,7 @@
             <div class="spacer"></div>
             <div class="game-menu">
                 <span class="info-label show-offline" style="display: none">Offline mode</span>
-                <button id="launch-btn" class="btn btn-primary btn-lg requires-available" disabled>Updating...</button>
+                <button id="launch-btn" class="btn btn-primary btn-lg" disabled>Updating...</button>
                 <button id="update-btn" class="btn btn-secondary btn-lg" title="Check for updates" disabled>
                     <svg width="24" height="20" viewBox="0 0 24 20" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path
@@ -177,48 +177,102 @@ <h1>Settings</h1>
         <h2>Launch Options</h2>
         <input id="launch-options" type="text"></input>
         <h2>Install Folder</h2>
-        <button id="open-folder-btn" class="btn btn-secondary requires-available" disabled>Browse Install Folder</button>
-        <button id="move-folder-btn" class="btn btn-secondary requires-available" disabled>Move Install Folder</button>
+        <button id="open-folder-btn" class="btn btn-secondary" disabled>Browse Install Folder</button>
+        <button id="move-folder-btn" class="btn btn-secondary" disabled>Move Install Folder</button>
     </div>
     <script>
-        function refreshAvailable(available) {
-            if (available && !document.getElementById("update-btn").disabled) {
-                document.querySelectorAll(".requires-available").forEach(el => el.disabled = false);
-            } else {
-                document.querySelectorAll(".requires-available").forEach(el => el.disabled = true);
+        let launchState = -1;
+        let errCode = 0;
+        let errLevel = 0;
+        let online = true;
+        let available = true;
+
+        function getLaunchBtnText() {
+            if (launchState === -1) {
+                return "Updating...";
+            }
+            if (launchState === 1) {
+                return "Launching..."
+            }
+            if (launchState === 2) {
+                return "Running"
             }
-        }
-        
-        function archiveReady(error) {
-            const online = error <= 0;
-            const hasErr = error !== 0;
-            const errLevel = Math.abs(error);
-            const available = errLevel <= 1;
-            document.getElementById("update-btn").disabled = false;
-            refreshAvailable(available);
             if (available) {
-                document.getElementById("launch-btn").innerText = "Launch";
+                return "Launch";
             } else {
-                document.getElementById("launch-btn").innerText = "Install failed";
+                return "Install failed";
             }
+        }
+
+        function updateLaunchBtnText() {
+            document.getElementById("launch-btn").innerText = getLaunchBtnText();
+        }
+
+        function updateLaunchBtnDisabled() {
+            document.getElementById("launch-btn").disabled = launchState !== 0 || !available;
+        }
+
+        function updateUpdateBtnDisabled() {
+            document.getElementById("update-btn").disabled = launchState !== 0;
+        }
+
+        function updateOpenFolderBtnDisabled() {
+            document.getElementById("open-folder-btn").disabled = !available;
+        }
+
+        function updateMoveFolderBtnDisabled() {
+            document.getElementById("move-folder-btn").disabled = launchState !== 0 || !available;
+        }
+
+        function updateAvailable() {    
+            available = launchState > -1 && errLevel <= 1;
+        }
+
+        function refreshOnline() {
             if (online) {
                 document.querySelector(".show-offline").style.display = "none";
             } else {
                 document.querySelector(".show-offline").style.display = "inline";
             }
         }
 
+        function setErrCode(inErrCode) {
+            // values
+            errCode = inErrCode;
+            errLevel = Math.abs(errCode);
+            online = errCode <= 0;
+            updateAvailable();
+            // effects
+            updateLaunchBtnText();
+            updateLaunchBtnDisabled();
+            updateOpenFolderBtnDisabled();
+            updateMoveFolderBtnDisabled();
+            refreshOnline();
+        }
+
+        function setLaunchState(state) {
+            // values
+            launchState = state;
+            updateAvailable();
+            // effects
+            updateLaunchBtnText();
+            updateLaunchBtnDisabled();
+            updateUpdateBtnDisabled();
+            updateOpenFolderBtnDisabled();
+            updateMoveFolderBtnDisabled();
+        }
+        
+        function archiveReady(inErrCode) {
+            setErrCode(inErrCode);
+            setLaunchState(0);
+        }
+
         document.getElementById("launch-btn").addEventListener("click", () => {
             if (document.getElementById("launch-btn").disabled) {
                 return;
             }
             window.pywebview.api.launch_game();
-            document.getElementById("launch-btn").disabled = true;
-            document.getElementById("launch-btn").innerText = "Launching...";
-            setTimeout(() => {
-                document.getElementById("launch-btn").disabled = false;
-                document.getElementById("launch-btn").innerText = "Launch";
-            }, 1000);
+            setLaunchState(1);
         });
         document.getElementById("settings-btn").addEventListener("click", () => {
             if (document.getElementById("settings-btn").disabled) {
@@ -250,9 +304,7 @@ <h2>Install Folder</h2>
             if (document.getElementById("update-btn").disabled) {
                 return;
             }
-            document.getElementById("update-btn").disabled = true;
-            document.getElementById("launch-btn").innerText = "Updating...";
-            refreshAvailable(false);
+            setLaunchState(-1);
             window.pywebview.api.check_for_updates();
         });
 

poetry.lock

@@ -16,6 +16,7 @@ dependencies = [
     "pyinstaller (>=6.17.0,<7.0.0)",
     "pywebview (>=6.1,<7.0) ; sys_platform == \"win32\"",
     "pywebview[gtk] (>=6.1,<7.0) ; sys_platform == \"linux\"",
+    "psutil (>=7.1.3,<8.0.0)",
 ]
 
 

pyproject.toml

@@ -12,12 +12,35 @@
     open_install_folder,
     set_launch_options,
     update_archive,
+    wait_game_exit,
+    wait_game_running,
 )
 
 
+def get_window(idx: int = 0):
+    return webview.windows[idx]
+
+
+def get_entrypoint():
+    def exists(path):
+        path = (Path(__file__).parent / path).resolve()
+        if path.exists():
+            return path
+
+    queries = ["../gui/index.html", "../Resources/gui/index.html", "./gui/index.html"]
+
+    for query in queries:
+        result = exists(query)
+        if result:
+            return result
+
+    raise Exception("No index.html found")
+
+
 class Api:
     def launch_game(self):
         launch_game()
+        check_launch_game()
 
     def set_launch_options(self, options):
         if options and isinstance(options, str):
@@ -31,11 +54,11 @@ def open_install_folder(self):
 
     def check_for_updates(self):
         res = update_archive()
-        webview.windows[0].evaluate_js(f"archiveReady({res});")
+        get_window().evaluate_js(f"archiveReady({res});")
 
     def move_install_folder(self):
         try:
-            result = webview.windows[0].create_file_dialog(webview.FileDialog.FOLDER)
+            result = get_window().create_file_dialog(webview.FileDialog.FOLDER)
             if not result:
                 return
             path = result[0]
@@ -46,27 +69,35 @@ def move_install_folder(self):
             return
 
 
-def get_entrypoint():
-    def exists(path):
-        path = (Path(__file__).parent / path).resolve()
-        if path.exists():
-            return path
+def update_and_notify(window):
+    res = update_archive()
+    window.evaluate_js(f"archiveReady({res});")
 
-    queries = ["../gui/index.html", "../Resources/gui/index.html", "./gui/index.html"]
 
-    for query in queries:
-        result = exists(query)
-        if result:
-            return result
+def on_game_exit():
+    window = get_window()
+    window.evaluate_js("setLaunchState(0);")
+    update_and_notify(window)
 
-    raise Exception("No index.html found")
+
+def check_launch_game():
+    pid = wait_game_running()
+    has_pid = pid is not None
+    res = 2 if has_pid else 0
+    get_window().evaluate_js(f"setLaunchState({res});")
+    if has_pid:
+        wait_game_exit(pid, on_game_exit)
+        return True
+    else:
+        return False
 
 
 def on_loaded(window):
-    res = update_archive()
-    window.evaluate_js(f"archiveReady({res});")
+    if not check_launch_game():
+        update_and_notify(window)
 
 
+debug = not getattr(sys, "frozen", False)
 entry_path = get_entrypoint()
 entry = str(entry_path)
 entry_parent = entry_path.parent
@@ -82,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"))
+            webview.start(icon=str(entry_parent / "favicon.ico"), debug=debug)
         except Exception as e:
             if os.name == "posix" and sys.platform != "darwin":
                 subprocess.run(

tc2_launcher/gui.py

@@ -4,10 +4,14 @@
 import subprocess
 import sys
 import tempfile
+import threading
 import zipfile
 from pathlib import Path
 from shutil import move, rmtree
+from time import sleep
+from timeit import default_timer as timer
 
+import psutil
 import requests
 
 TC2_REPO = "mastercomfig/tc2"
@@ -329,18 +333,22 @@ def get_game_dir(dest: Path | None = None) -> Path:
     return dest / "game"
 
 
+def _get_game_exe_name(running_process: bool = False) -> str:
+    # Determine executable name based on platform
+    if sys.platform.startswith("win"):
+        return "tc2_win64.exe"
+    else:
+        return "tc2_linux64" if running_process else "tc2.sh"
+
+
 def _get_game_exe(dest: Path | None) -> Path | None:
     if not dest:
         dest = default_dest_dir()
 
     game_dir = get_game_dir(dest)
 
     # Determine executable based on platform
-    exe_path = None
-    if sys.platform.startswith("win"):
-        exe_path = game_dir / "tc2_win64.exe"
-    else:
-        exe_path = game_dir / "tc2.sh"
+    exe_path = game_dir / _get_game_exe_name()
 
     if exe_path and exe_path.exists():
         return exe_path
@@ -391,6 +399,35 @@ def launch_game(
         print(f"Failed to launch game: {e}")
 
 
+def _wait_game_exit_inner(pid, callback):
+    try:
+        p = psutil.Process(pid)
+        p.wait()
+        callback()
+    except Exception:
+        pass
+
+
+def wait_game_exit(pid, callback):
+    wait_game_exit_thread = threading.Thread(
+        target=_wait_game_exit_inner, args=(pid, callback)
+    )
+    wait_game_exit_thread.start()
+
+
+def wait_game_running() -> int | None:
+    game_exe_name = _get_game_exe_name(running_process=True)
+    time_limit = 5
+    while time_limit > 0:
+        for p in psutil.process_iter(["pid", "name"]):
+            if p.info["name"] == game_exe_name:
+                return p.pid
+        before = timer()
+        sleep(0.2)
+        time_limit -= timer() - before
+    return None
+
+
 def get_launch_options(dest: Path | None = None) -> list[str]:
     if not dest:
         dest = default_dest_dir()