From 03cb24d4000316fe7d0816a4929bb38ea8ffddf2 Mon Sep 17 00:00:00 2001
From: Dunedan <dunedan@phoenitydawn.de>
Date: Mon, 3 Mar 2025 17:45:08 +0100
Subject: [PATCH] Move xmlvalidator code to entity directory

The xmlvalidator logic is only used by the checkrefs.py script, so this
moves it to the same directory to have it co-located and avoid having to
modify sys.path to import it.
---
 source/tools/LICENSE.txt                                  | 3 ---
 source/tools/entity/checkrefs.py                          | 8 ++------
 source/tools/{xmlvalidator => entity}/validate.pl         | 0
 source/tools/{xmlvalidator => entity}/validate_grammar.py | 0
 source/tools/{xmlvalidator => entity}/validator.py        | 0
 5 files changed, 2 insertions(+), 9 deletions(-)
 rename source/tools/{xmlvalidator => entity}/validate.pl (100%)
 rename source/tools/{xmlvalidator => entity}/validate_grammar.py (100%)
 rename source/tools/{xmlvalidator => entity}/validator.py (100%)

diff --git a/source/tools/LICENSE.txt b/source/tools/LICENSE.txt
index 28eb660e13..6aa382dd4b 100644
--- a/source/tools/LICENSE.txt
+++ b/source/tools/LICENSE.txt
@@ -64,6 +64,3 @@ in particular, let us know and we can try to clarify it.
 
   webservices
     MIT / unspecified
-
-  xmlvalidator
-    MIT
diff --git a/source/tools/entity/checkrefs.py b/source/tools/entity/checkrefs.py
index 1f24ff6768..2e6ed3cad7 100755
--- a/source/tools/entity/checkrefs.py
+++ b/source/tools/entity/checkrefs.py
@@ -11,6 +11,8 @@ from struct import calcsize, unpack
 from xml.etree import ElementTree as ET
 
 from scriptlib import SimulTemplateEntity, find_files
+from validate_grammar import RelaxNGValidator
+from validator import Validator
 
 
 class SingleLevelFilter(Filter):
@@ -151,16 +153,10 @@ class CheckRefs:
         if args.check_unused:
             self.check_unused()
         if args.validate_templates:
-            sys.path.append(str(Path(__file__).parent.parent / "xmlvalidator"))
-            from validate_grammar import RelaxNGValidator
-
             validate = RelaxNGValidator(self.vfs_root, self.mods)
             if not validate.run():
                 self.inError = True
         if args.validate_actors:
-            sys.path.append(str(Path(__file__).parent.parent / "xmlvalidator"))
-            from validator import Validator
-
             validator = Validator(self.vfs_root, self.mods)
             if not validator.run():
                 self.inError = True
diff --git a/source/tools/xmlvalidator/validate.pl b/source/tools/entity/validate.pl
similarity index 100%
rename from source/tools/xmlvalidator/validate.pl
rename to source/tools/entity/validate.pl
diff --git a/source/tools/xmlvalidator/validate_grammar.py b/source/tools/entity/validate_grammar.py
similarity index 100%
rename from source/tools/xmlvalidator/validate_grammar.py
rename to source/tools/entity/validate_grammar.py
diff --git a/source/tools/xmlvalidator/validator.py b/source/tools/entity/validator.py
similarity index 100%
rename from source/tools/xmlvalidator/validator.py
rename to source/tools/entity/validator.py