Use PrintBar instead of 'message()' fn

Author: mzuenni

bin/export.py

@@ -23,8 +23,6 @@
     has_substitute,
     inc_label,
     log,
-    message,
-    MessageType,
     normalize_yaml_value,
     parse_yaml,
     PrintBar,
@@ -138,6 +136,8 @@ def build_problem_zip(problem: Problem, output: Path) -> bool:
         error("zip needs the ruamel.yaml python3 library. Install python[3]-ruamel.yaml.")
         return False
 
+    bar = PrintBar("Zip", len(problem.name) + 4, item=problem)
+
     from ruamel.yaml.comments import CommentedMap
 
     languages = select_languages([problem])
@@ -167,7 +167,7 @@ def build_problem_zip(problem: Problem, output: Path) -> bool:
     if problem.custom_output:
         files.append((f"{OutputValidator.source_dir}/**/*", True))
 
-    message("preparing zip file content", "Zip", problem.path, color_type=MessageType.LOG)
+    bar.log("preparing zip file content")
 
     # prepare files inside dir
     export_dir = problem.tmpdir / "export"
@@ -257,11 +257,13 @@ def add_testcase(in_file: Path) -> None:
                         text,
                         problem.settings.constants,
                         pattern=config.CONSTANT_SUBSTITUTE_REGEX,
-                        bar=PrintBar("Zip"),
+                        bar=bar,
                     )
                     f.unlink()
                     f.write_text(text)
 
+    bar = bar.start(output)
+
     # move pdfs
     if config.args.legacy and languages:
         for type in PdfType:
@@ -277,7 +279,7 @@ def add_testcase(in_file: Path) -> None:
                 if not file.exists():
                     continue
                 if out.exists():
-                    warn(f"can't add {path} (already exists).")
+                    bar.warn(f"can't add {path} (already exists).")
                     file.unlink()
                     continue
                 out.parent.mkdir(parents=True, exist_ok=True)
@@ -370,12 +372,7 @@ def add_testcase(in_file: Path) -> None:
                 if f.is_file():
                     out = Path("problem_statement") / f.relative_to(problem.path / d)
                     if out.exists():
-                        message(
-                            f"Can not export {f.relative_to(problem.path)} as {out}",
-                            "Zip",
-                            output,
-                            color_type=MessageType.WARN,
-                        )
+                        bar.warn(f"Cannot export {f.relative_to(problem.path)} as {out}")
                     else:
                         add_file(out, f)
             shutil.rmtree(export_dir / d)
@@ -397,7 +394,7 @@ def add_testcase(in_file: Path) -> None:
     write_yaml(yaml_data, yaml_path)
 
     # Build .ZIP file.
-    message("writing zip file", "Zip", output, color_type=MessageType.LOG)
+    bar.log("writing zip file")
     try:
         zf = zipfile.ZipFile(output, mode="w", compression=zipfile.ZIP_DEFLATED, allowZip64=False)
 
@@ -410,7 +407,7 @@ def add_testcase(in_file: Path) -> None:
 
         # Done.
         zf.close()
-        message("done", "Zip", color_type=MessageType.LOG)
+        bar.log("done")
         eprint()
     except Exception:
         return False

bin/fuzz.py

@@ -16,8 +16,7 @@
     error,
     fatal,
     has_ryaml,
-    message,
-    MessageType,
+    PrintBar,
     ProgressBar,
     read_yaml,
     ryaml_get_or_add,
@@ -261,8 +260,6 @@ def run(self) -> bool:
             error("No submissions found.")
             return False
 
-        message("Press CTRL+C to stop\n", "Fuzz", color_type=MessageType.LOG)
-
         def runner(task: GeneratorTask | SubmissionTask) -> None:
             task.run(bar)
 
@@ -286,6 +283,9 @@ def runner(task: GeneratorTask | SubmissionTask) -> None:
             ],
         )
         max_len += len(f"{self.tmp_ids}: ")
+        # we use a PrintBar after an aboard
+        printbar = PrintBar("Fuzz", max_len=max_len)
+        printbar.log("Press CTRL+C to stop\n")
         bar = FuzzProgressBar(self.queue, "Fuzz", max_len=max_len)
 
         def soft_exit(sig: Any, frame: Any) -> None:
@@ -295,11 +295,7 @@ def soft_exit(sig: Any, frame: Any) -> None:
                 self.queue.abort()
                 with bar:
                     eprint(bar.carriage_return)
-                    message(
-                        "Running interrupted (waiting on remaining tasks)\n",
-                        "\nFuzz",
-                        color_type=MessageType.ERROR,
-                    )
+                    printbar.error("Running interrupted (waiting on remaining tasks)\n")
 
         old_handler = signal.signal(signal.SIGINT, soft_exit)
 
@@ -315,8 +311,8 @@ def soft_exit(sig: Any, frame: Any) -> None:
 
         for submission, verdicts in self.summary.items():
             msg = ", ".join(f"{v.color()}{v.short()}{Style.RESET_ALL}" for v in sorted(verdicts))
-            message(msg, "Fuzz", submission.name)
-        message(f"Found {self.added} testcases in total.", "Fuzz")
+            printbar.start(submission).log(msg, color="")
+        printbar.log(f"Found {self.added} testcases in total.", color="")
 
         if self.queue.aborted:
             fatal("Running interrupted")