Allow looking for multiple executable names

README.md

@@ -10,6 +10,7 @@ virtual file system and provides similar functionality using OverlayFS.
   - Implemented
   - The mod structure has to be manually managed, i.e. PAKs must reside in the correct directory relative to their installation path
 - [x] Project Diva Mega Mix+
+- [x] Lethal Company
 
 ## Mod Configuration
 

lmm/cli.py

@@ -1,5 +1,6 @@
 import os
 from typing import Optional
+import time
 
 from lmm.config import LMMConfig
 from lmm.const import LMM_GAMES_PATH

lmm/games/bg3.py

@@ -134,8 +134,12 @@ class BaldursGate3Game(ProtonGame):
         return overlays
 
     @property
-    def game_executable(self) -> Path:
-        return self.installation_path / "bin" / "bg3.exe"
+    def game_executables(self) -> list[Path]:
+        # Handle both the Dx11 version and the Vulkan version.
+        return [
+            self.installation_path / "bin" / "bg3_dx11.exe",
+            self.installation_path / "bin" / "bg3.exe",
+        ]
 
     def to_dict(self) -> dict[str, Any]:
         return {

lmm/games/game.py

@@ -91,7 +91,7 @@ class ProtonGame(Game, abc.ABC):
         raise NotImplementedError()
 
     @property
-    def game_executable(self) -> Path:
+    def game_executables(self) -> list[Path]:
         raise NotImplementedError()
 
     @property
@@ -101,9 +101,10 @@ class ProtonGame(Game, abc.ABC):
     def wait(self):
         # Wait until we started the game.
         proc = Path("/proc")
-        windows_path = str(self.game_executable).replace("/", "\\")
-        wine_exe_path = f"Z:{windows_path}"
-        print(wine_exe_path)
+        windows_paths = [str(executable).replace("/", "\\") for executable in self.game_executables]
+        wine_exe_paths = [f"Z:{windows_path}" for windows_path in windows_paths]
+        executables = [str(exe) for exe in self.game_executables]
+        print(wine_exe_paths)
         print("Polling for game process...")
         while True:
             for dir in os.listdir(proc):
@@ -127,9 +128,9 @@ class ProtonGame(Game, abc.ABC):
                     abs_cmdline = os.path.abspath(cmdline).replace("\x00", "")
 
                     if (
-                        cmdline.startswith(wine_exe_path)
-                        or abs_cmdline == str(self.game_executable)
-                        or abs_cmdline.startswith(str(self.game_executable))
+                        any(cmdline.startswith(wine_exe_path) for wine_exe_path in wine_exe_paths)
+                        or abs_cmdline in executables
+                        or any(abs_cmdline.startswith(exe) for exe in executables)
                     ):
                         self._pid = dir
                         break

lmm/games/lc.py

@@ -35,8 +35,10 @@ class LethalCompanyGame(ProtonGame):
         )
 
     @property
-    def game_executable(self) -> Path:
-        return self.installation_path / "Lethal Company.exe"
+    def game_executables(self) -> list[Path]:
+        return [
+            self.installation_path / "Lethal Company.exe",
+        ]
 
     def prepare_overlays(
         self, profile: LethalCompanyProfile

lmm/games/pdmm.py

@@ -35,8 +35,10 @@ class ProjectDivaMegaMixGame(ProtonGame):
         )
 
     @property
-    def game_executable(self) -> Path:
-        return self.installation_path / "DivaMegaMix.exe"
+    def game_executables(self) -> list[Path]:
+        return [
+            self.installation_path / "DivaMegaMix.exe",
+        ]
 
     def prepare_overlays(
         self, profile: ProjectDivaMegaMixProfile

lmm/games/ron.py

@@ -46,8 +46,10 @@ class ReadyOrNotGame(ProtonGame):
         ]
 
     @property
-    def game_executable(self) -> Path:
-        return self.installation_path / "ReadyOrNot.exe"
+    def game_executables(self) -> list[Path]:
+        return [
+            self.installation_path / "ReadyOrNot.exe",
+        ]
 
     def to_dict(self) -> dict[str, Any]:
         return {

lmm/overlayfs.py

@@ -136,7 +136,7 @@ class OverlayFSMount:
                     print(f"Failed to clean temporary directory {self.workdir.name}")
 
             self._mounted = False
-            return True
+        return True
 
     def __del__(self):
         self.unmount()