morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

improve enemizer logging

Browse Source
This commit is contained in:
Fabian Dill
2021-01-27 02:32:38 +01:00
parent bee6e87615
commit 7531bb9d11
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gui.py
View File

@@ -1909,5 +1909,5 @@ if __name__ == '__main__':
top.update() top.update()
print("Done updating sprites") print("Done updating sprites")
else: else:
logging.basicConfig(format='%(message)s', level=logging.INFO) logging.basicConfig(level=logging.INFO)
guiMain() guiMain()

10
Rom.py
View File

@@ -39,6 +39,7 @@ try:
except: except:
z3pr = None z3pr = None
enemizer_logger = logging.getLogger("Enemizer")
class LocalRom(object): class LocalRom(object):
@@ -195,7 +196,7 @@ def check_enemizer(enemizercli):
if lib.startswith("EnemizerLibrary/"): if lib.startswith("EnemizerLibrary/"):
version = lib.split("/")[-1] version = lib.split("/")[-1]
version = tuple(int(element) for element in version.split(".")) version = tuple(int(element) for element in version.split("."))
logging.debug(f"Found Enemizer version {version}") enemizer_logger.debug(f"Found Enemizer version {version}")
if version < (6, 4, 0): if version < (6, 4, 0):
raise Exception( raise Exception(
f"Enemizer found at {enemizercli} is outdated ({info}), please update your Enemizer. " f"Enemizer found at {enemizercli} is outdated ({info}), please update your Enemizer. "
@@ -390,10 +391,13 @@ def patch_enemizer(world, player: int, rom: LocalRom, enemizercli):
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
logging.debug( enemizer_logger.debug(
f"Enemizer attempt {i + 1} of {max_enemizer_tries} for player {player} using enemizer seed {enemizer_seed}") f"Enemizer attempt {i + 1} of {max_enemizer_tries} for player {player} using enemizer seed {enemizer_seed}")
for stdout_line in iter(p_open.stdout.readline, ""): for stdout_line in iter(p_open.stdout.readline, ""):
logging.debug(stdout_line.rstrip()) if i == max_enemizer_tries - 1:
enemizer_logger.warning(stdout_line.rstrip())
else:
enemizer_logger.debug(stdout_line.rstrip())
p_open.stdout.close() p_open.stdout.close()
return_code = p_open.wait() return_code = p_open.wait()