From ff1de5b36ba3b539419e8ea035b6def2cbe3d753 Mon Sep 17 00:00:00 2001 From: Stanislas Daniel Claude Dolcini Date: Fri, 3 Feb 2023 11:46:05 +0100 Subject: [PATCH] Minor fixes two missing includes make errors a bit more explicit in case of corrupted template --- A25_A26/P256.py | 6 +++++- A25_A26/PlayerXMLFixer.py | 1 + utils/fixers/BaseFixer.py | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/A25_A26/P256.py b/A25_A26/P256.py index 20cd1fe..0d1be5c 100644 --- a/A25_A26/P256.py +++ b/A25_A26/P256.py @@ -22,7 +22,11 @@ class TemplateFixer: self.template_folder = os.path.join(vfs_root, 'simulation', 'templates') def fix_template(self, template_path): - tree = ET.parse(template_path) + try: + tree = ET.parse(template_path) + except Exception as e: + print("Invalid file: " + template_path) + raise e root = tree.getroot() production_queue = root.find('ProductionQueue') if production_queue == None: diff --git a/A25_A26/PlayerXMLFixer.py b/A25_A26/PlayerXMLFixer.py index 591550f..3415802 100644 --- a/A25_A26/PlayerXMLFixer.py +++ b/A25_A26/PlayerXMLFixer.py @@ -10,6 +10,7 @@ from utils.fixers.BaseFixer import BaseFixer from pathlib import Path import os import json +import shutil import xml.etree.ElementTree as ET class PlayerXMLFixer(BaseFixer): diff --git a/utils/fixers/BaseFixer.py b/utils/fixers/BaseFixer.py index f15577d..77ce0f3 100644 --- a/utils/fixers/BaseFixer.py +++ b/utils/fixers/BaseFixer.py @@ -10,6 +10,7 @@ from ..logger_utils.InterceptableLogger import InterceptableLogger from pathlib import Path import fileinput import os +import xml.etree.ElementTree as ET class BaseFixer(): def __init__(self, vfs_root, verbose=False, name=__name__):