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

worlds,clients,kvui: use user_path (#1622)

This commit is contained in:
black-sliver 2023-03-29 20:14:45 +02:00 committed by GitHub
parent bb79073ce7
commit 639606e0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OoTClient.py
View File

@ -289,7 +289,10 @@ async def patch_and_run_game(apz5_file):
decomp_path = base_name + '-decomp.z64' decomp_path = base_name + '-decomp.z64'
comp_path = base_name + '.z64' comp_path = base_name + '.z64'
# Load vanilla ROM, patch file, compress ROM # Load vanilla ROM, patch file, compress ROM
rom = Rom(Utils.local_path(Utils.get_options()["oot_options"]["rom_file"])) rom_file_name = Utils.get_options()["oot_options"]["rom_file"]
if not os.path.exists(rom_file_name):
rom_file_name = Utils.user_path(rom_file_name)
rom = Rom(rom_file_name)
apply_patch_file(rom, apz5_file, apply_patch_file(rom, apz5_file,
sub_file=(os.path.basename(base_name) + '.zpf' sub_file=(os.path.basename(base_name) + '.zpf'
if zipfile.is_zipfile(apz5_file) if zipfile.is_zipfile(apz5_file)

5
Utils.py
View File

@ -88,7 +88,10 @@ def is_frozen() -> bool:
def local_path(*path: str) -> str: def local_path(*path: str) -> str:
"""Returns path to a file in the local Archipelago installation or source.""" """
Returns path to a file in the local Archipelago installation or source.
This might be read-only and user_path should be used instead for ROMs, configuration, etc.
"""
if hasattr(local_path, 'cached_path'): if hasattr(local_path, 'cached_path'):
pass pass
elif is_frozen(): elif is_frozen():

2
kvui.py
View File

@ -612,7 +612,7 @@ class KivyJSONtoTextParser(JSONtoTextParser):
ExceptionManager.add_handler(E()) ExceptionManager.add_handler(E())
Builder.load_file(Utils.local_path("data", "client.kv")) Builder.load_file(Utils.local_path("data", "client.kv"))
user_file = Utils.local_path("data", "user.kv") user_file = Utils.user_path("data", "user.kv")
if os.path.exists(user_file): if os.path.exists(user_file):
logging.info("Loading user.kv into builder.") logging.info("Loading user.kv into builder.")
Builder.load_file(user_file) Builder.load_file(user_file)

2
worlds/pokemon_rb/rom.py
View File

@ -955,7 +955,7 @@ def get_base_rom_path(game_version: str) -> str:
options = Utils.get_options() options = Utils.get_options()
file_name = options["pokemon_rb_options"][f"{game_version}_rom_file"] file_name = options["pokemon_rb_options"][f"{game_version}_rom_file"]
if not os.path.exists(file_name): if not os.path.exists(file_name):
file_name = Utils.local_path(file_name) file_name = Utils.user_path(file_name)
return file_name return file_name

4
worlds/tloz/Rom.py
View File

@ -74,5 +74,5 @@ def get_base_rom_path(file_name: str = "") -> str:
if not file_name: if not file_name:
file_name = options["tloz_options"]["rom_file"] file_name = options["tloz_options"]["rom_file"]
if not os.path.exists(file_name): if not os.path.exists(file_name):
file_name = Utils.local_path(file_name) file_name = Utils.user_path(file_name)
return file_name return file_name