Fix macOS .app bundle support for game launch

common/structs.py

@@ -1036,16 +1036,22 @@ def validate_executables(self):
                     if base in exe.parents:
                         self.executables[i] = exe.relative_to(base).as_posix()
                         changed = True
-                    executables_valids.append(exe.is_file())
+                    executables_valids.append(exe.is_file() or (globals.os is Os.MacOS and exe.suffix == ".app" and exe.is_dir()))
                 else:
-                    executables_valids.append((base / exe).is_file())
+                    abs_exe = base / exe
+                    executables_valids.append(abs_exe.is_file() or (globals.os is Os.MacOS and abs_exe.suffix == ".app" and abs_exe.is_dir()))
             self.executables_valids = executables_valids
             if changed:
                 from external import async_thread
                 from modules import db
                 async_thread.run(db.update_game(self, "executables"))
         else:
-            self.executables_valids = [utils.is_uri(executable) or os.path.isfile(executable) for executable in self.executables]
+            def _exe_valid(executable):
+                if utils.is_uri(executable):
+                    return True
+                exe = pathlib.Path(executable)
+                return exe.is_file() or (globals.os is Os.MacOS and exe.suffix == ".app" and exe.is_dir())
+            self.executables_valids = [_exe_valid(e) for e in self.executables]
         self.executables_valid = all(self.executables_valids)
         if globals.gui:
             globals.gui.recalculate_ids = True

external/filepicker.py

@@ -105,7 +105,8 @@ def refresh(self):
                 items.sort(key=lambda item: item.name.lower())  # Sort alphabetically
                 items.sort(key=lambda item: item.is_dir(), reverse=True)  # Sort dirs first
                 for item in items:
-                    self.items.append((dir_icon if item.is_dir() else file_icon) + item.name)
+                    is_app_bundle = sys.platform.startswith("darwin") and item.is_dir() and item.suffix == ".app"
+                    self.items.append((file_icon if (not item.is_dir() or is_app_bundle) else dir_icon) + item.name)
             else:
                 self.items.append("No items match your filter!" if self.filter_box_text else "This folder is empty!")
         except Exception:

modules/callbacks.py

@@ -178,6 +178,9 @@ async def _launch_exe(executable: str):
     exe = pathlib.Path(executable)
     if globals.settings.default_exe_dir.get(globals.os) and not exe.is_absolute():
         exe = pathlib.Path(globals.settings.default_exe_dir.get(globals.os)) / exe
+    if globals.os is Os.MacOS and exe.suffix == ".app" and exe.is_dir():
+        await default_open(str(exe))
+        return
     if not exe.is_file():
         raise FileNotFoundError()