monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BizHawkClient: Use `local_path` when autolaunching BizHawk with lua script (#2526) 

* BizHawkClient: Change autolaunch path to lua script to use local_path

* BizHawkClient: Remove unnecessary call to os.path.join and linting
This commit is contained in:
Bryce Wilson 2023-11-28 13:56:27 -08:00 committed by GitHub
parent ce2f9312ca
commit 737686a88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
worlds/_bizhawk/context.py
View File

@ -208,19 +208,30 @@ async def _run_game(rom: str):
if auto_start is True: if auto_start is True:
emuhawk_path = Utils.get_settings().bizhawkclient_options.emuhawk_path emuhawk_path = Utils.get_settings().bizhawkclient_options.emuhawk_path
subprocess.Popen([emuhawk_path, "--lua=data/lua/connector_bizhawk_generic.lua", os.path.realpath(rom)], subprocess.Popen(
[
emuhawk_path,
f"--lua={Utils.local_path('data', 'lua', 'connector_bizhawk_generic.lua')}",
os.path.realpath(rom),
],
cwd=Utils.local_path("."), cwd=Utils.local_path("."),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL,
)
elif isinstance(auto_start, str): elif isinstance(auto_start, str):
import shlex import shlex
subprocess.Popen([*shlex.split(auto_start), os.path.realpath(rom)], subprocess.Popen(
[
*shlex.split(auto_start),
os.path.realpath(rom)
],
cwd=Utils.local_path("."), cwd=Utils.local_path("."),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL
)
async def _patch_and_run_game(patch_file: str): async def _patch_and_run_game(patch_file: str):