Use Validator.source_dir at all places (#444)

* use source_dir at all places

* use source_dir even more

* fix bits/stdc++ check

Author: mzuenni

bin/export.py

@@ -11,6 +11,7 @@
 from contest import *
 from latex import PdfType
 from problem import Problem
+from validate import InputValidator, AnswerValidator, OutputValidator
 
 
 def select_languages(problems: list[Problem]) -> list[str]:
@@ -118,8 +119,8 @@ def build_problem_zip(problem: Problem, output: Path) -> bool:
         ("solution/*", False),
         ("problem_slide/*", False),
         ("generators/*", False),
-        ("input_validators/**/*", True),
-        ("answer_validators/**/*", False),  # TODO make required when not problem.interactive?
+        (f"{InputValidator.source_dir}/**/*", True),
+        (f"{AnswerValidator.source_dir}/**/*", False),  # TODO required when not interactive?
         ("submissions/accepted/**/*", True),
         ("submissions/*/**/*", False),
         ("attachments/**/*", problem.interactive or problem.multi_pass),
@@ -133,7 +134,7 @@ def build_problem_zip(problem: Problem, output: Path) -> bool:
             files.append((PdfType.SOLUTION.path(language, ".pdf").name, False))
 
     if problem.custom_output:
-        files.append(("output_validator/**/*", True))
+        files.append((f"{OutputValidator.source_dir}/**/*", True))
 
     message("preparing zip file content", "Zip", problem.path, color_type=MessageType.LOG)
 
@@ -205,9 +206,9 @@ def add_testcase(in_file: Path) -> None:
     if problem.settings.constants:
         constants_supported = [
             "data/**/testdata.yaml",
-            "input_validators/**/*",
-            "answer_validators/**/*",
-            "output_validator/**/*",
+            f"{InputValidator.source_dir}/**/*",
+            f"{AnswerValidator.source_dir}/**/*",
+            f"{OutputValidator.source_dir}/**/*",
             # "statement/*", "solution/*", "problem_slide/*", use \constant{} commands
             # "submissions/*/**/*", removed support?
         ]
@@ -316,10 +317,10 @@ def add_testcase(in_file: Path) -> None:
                         util.error(f"{f}: no name set for language {lang}.")
 
         # rename output_validator dir
-        if (export_dir / "output_validator").exists():
+        if (export_dir / OutputValidator.source_dir).exists():
             (export_dir / "output_validators").mkdir(parents=True)
-            (export_dir / "output_validator").rename(
-                export_dir / "output_validators" / "output_validator"
+            (export_dir / OutputValidator.source_dir).rename(
+                export_dir / "output_validators" / OutputValidator.source_dir
             )
 
         # rename statement dirs

bin/problem.py

@@ -241,7 +241,9 @@ def __init__(
         self.interactive: bool = "interactive" in mode
         self.multi_pass: bool = "multi-pass" in mode
         self.custom_output: bool = (
-            self.interactive or self.multi_pass or (problem.path / "output_validator").is_dir()
+            self.interactive
+            or self.multi_pass
+            or (problem.path / validate.OutputValidator.source_dir).is_dir()
         )
 
         self.name: dict[str, str] = parse_setting(yaml_data, "name", {"en": ""})

bin/program.py

@@ -307,12 +307,11 @@ def _checks(self, bar: ProgressBar):
             for f in self.source_files:
                 try:
                     if f.read_text().find("bits/stdc++.h") != -1:
-                        if "validators/" in str(f):
-                            bar.error("Must not depend on bits/stdc++.h.", resume=True)
-                            break
-                        else:
+                        if f.is_relative_to(self.problem.path / "submissions"):
                             bar.log("Should not depend on bits/stdc++.h")
-                            break
+                        else:
+                            bar.error("Must not depend on bits/stdc++.h.", resume=True)
+                        break
                 except UnicodeDecodeError:
                     pass
 

bin/skel.py

@@ -4,10 +4,11 @@
 
 # Local imports
 import config
+import contest
 import latex
 from problem import Problem
 from util import *
-import contest
+from validate import OutputValidator
 
 try:
     import questionary
@@ -254,7 +255,7 @@ def new_problem():
         variables,
         exist_ok=True,
         preserve_symlinks=preserve_symlinks,
-        skip=[skeldir / "output_validator"] if not custom_output else None,
+        skip=[skeldir / OutputValidator.source_dir] if not custom_output else None,
     )
 
     # Warn about missing problem statement skeletons for non-en languages

bin/stats.py

@@ -13,6 +13,7 @@
 import generate
 import latex
 import program
+import validate
 from util import error, exec_command, glob, warn
 
 Selector = str | Callable | list[str] | list[Callable]
@@ -51,9 +52,9 @@ def problem_stats(problems):
         ("yaml", "problem.yaml"),
         ("tex", str(latex.PdfType.PROBLEM.path("*")), 1),
         ("sol", str(latex.PdfType.SOLUTION.path("*")), 1),
-        ("  val: I", ["input_validators/*"]),
-        ("A", ["answer_validators/*"]),
-        ("O", ["output_validator/"]),
+        ("  val: I", [f"{validate.InputValidator.source_dir}/*"]),
+        ("A", [f"{validate.AnswerValidator.source_dir}/*"]),
+        ("O", [f"{validate.OutputValidator.source_dir}/*"]),
         (
             "  sample",
             [lambda s: {x.stem for x in s if x.parts[2] == "sample"}],

bin/upgrade.py

@@ -1,6 +1,7 @@
 import config
 import generate
 from util import *
+from validate import InputValidator, AnswerValidator, OutputValidator
 
 import shutil
 from typing import Any
@@ -153,8 +154,8 @@ def upgrade_statement(problem_path: Path, bar: ProgressBar) -> None:
 
 def upgrade_format_validators(problem_path: Path, bar: ProgressBar) -> None:
     rename = [
-        ("input_format_validators", "input_validators"),
-        ("answer_format_validators", "answer_validators"),
+        ("input_format_validators", InputValidator.source_dir),
+        ("answer_format_validators", AnswerValidator.source_dir),
     ]
     for old_name, new_name in rename:
         old_path = problem_path / old_name
@@ -169,14 +170,17 @@ def upgrade_format_validators(problem_path: Path, bar: ProgressBar) -> None:
 
 def upgrade_output_validators(problem_path: Path, bar: ProgressBar) -> None:
     if (problem_path / "output_validators").is_dir():
-        if (problem_path / "output_validator").exists():
+        if (problem_path / OutputValidator.source_dir).exists():
             bar.error(
-                "can't rename 'output_validators/', 'output_validator/' already exists", resume=True
+                f"can't rename 'output_validators/', '{OutputValidator.source_dir}/' already exists",
+                resume=True,
             )
             return
         content = [*(problem_path / "output_validators").iterdir()]
         if len(content) == 1 and content[0].is_dir():
-            bar.log(f"renaming 'output_validators/{content[0].name}' to 'output_validator/'")
+            bar.log(
+                f"renaming 'output_validators/{content[0].name}' to '{OutputValidator.source_dir}/'"
+            )
 
             def move(src: str, dst: str) -> None:
                 if Path(src).is_symlink():
@@ -198,11 +202,13 @@ def move(src: str, dst: str) -> None:
                 else:
                     Path(src).rename(dst)
 
-            shutil.copytree(content[0], problem_path / "output_validator", copy_function=move)
+            shutil.copytree(
+                content[0], problem_path / OutputValidator.source_dir, copy_function=move
+            )
             shutil.rmtree(problem_path / "output_validators")
         else:
-            bar.log("renaming 'output_validators/' to 'output_validator/'")
-            (problem_path / "output_validators").rename(problem_path / "output_validator")
+            bar.log(f"renaming 'output_validators/' to '{OutputValidator.source_dir}/'")
+            (problem_path / "output_validators").rename(problem_path / OutputValidator.source_dir)
 
 
 def upgrade_problem_yaml(problem_path: Path, bar: ProgressBar) -> None:

bin/validate.py

@@ -224,13 +224,13 @@ class InputValidator(Validator):
     Also supports checktestdata and viva files, with different invocation.
     """
 
-    def __init__(self, problem, path, **kwargs):
-        super().__init__(problem, path, "input_validators", **kwargs)
-
     validator_type: Final[str] = "input"
 
     source_dir: Final[str] = "input_validators"
 
+    def __init__(self, problem, path, **kwargs):
+        super().__init__(problem, path, InputValidator.source_dir, **kwargs)
+
     def run(
         self,
         testcase: testcase.Testcase,
@@ -284,13 +284,13 @@ class AnswerValidator(Validator):
     Also supports checktestdata and viva files, with different invocation.
     """
 
-    def __init__(self, problem, path, **kwargs):
-        super().__init__(problem, path, "answer_validators", **kwargs)
-
     validator_type: Final[str] = "answer"
 
     source_dir: Final[str] = "answer_validators"
 
+    def __init__(self, problem, path, **kwargs):
+        super().__init__(problem, path, AnswerValidator.source_dir, **kwargs)
+
     def run(
         self,
         testcase: testcase.Testcase,
@@ -335,13 +335,13 @@ class OutputValidator(Validator):
        ./validator input answer feedbackdir [arguments from problem.yaml] < output
     """
 
-    def __init__(self, problem, path, **kwargs):
-        super().__init__(problem, path, "output_validator", **kwargs)
-
     validator_type: Final[str] = "output"
 
     source_dir: Final[str] = "output_validator"
 
+    def __init__(self, problem, path, **kwargs):
+        super().__init__(problem, path, OutputValidator.source_dir, **kwargs)
+
     def run(
         self,
         testcase: testcase.Testcase,