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

OoTAdjuster: check on subprocess compressor

This commit is contained in:
Fabian Dill 2021-12-10 09:53:50 +01:00
parent e1fc44f4e0
commit 7afbf8b45b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worlds/oot/Rom.py
View File

@ -282,22 +282,22 @@ class Rom(BigStream):
def compress_rom_file(input_file, output_file): def compress_rom_file(input_file, output_file):
subcall = []
compressor_path = data_path("Compress") compressor_path = data_path("Compress")
if platform.system() == 'Windows': if platform.system() == 'Windows':
compressor_path += "\\Compress.exe" executable_path = "Compress.exe"
elif platform.system() == 'Linux': elif platform.system() == 'Linux':
if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64': if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64':
compressor_path += "/Compress_ARM64" executable_path = "Compress_ARM64"
else: else:
compressor_path += "/Compress" executable_path = "Compress"
elif platform.system() == 'Darwin': elif platform.system() == 'Darwin':
compressor_path += "/Compress.out" executable_path = "Compress.out"
else: else:
raise RuntimeError('Unsupported operating system for compression.') raise RuntimeError('Unsupported operating system for compression.')
compressor_path = os.path.join(compressor_path, executable_path)
if not os.path.exists(compressor_path): if not os.path.exists(compressor_path):
raise RuntimeError(f'Compressor does not exist! Please place it at {compressor_path}.') raise RuntimeError(f'Compressor does not exist! Please place it at {compressor_path}.')
process = subprocess.call([compressor_path, input_file, output_file], **subprocess_args(include_stdout=False)) import logging
logging.info(subprocess.check_output([compressor_path, input_file, output_file],
**subprocess_args(include_stdout=False)))