extension de export/import aux autres modes de génération

export.py

@@ -13,6 +13,8 @@ from copienator import (
 )
 from platform_utils import replace_with_link_or_copy
 
+ANNOTATION_DIRECTORIES = ("BGnot", "Bnot", "Anot")
+
 
 def export_directory(
     workspace: EvaluationWorkspace,
@@ -31,12 +33,22 @@ def export_directory(
 
     missing_outputs = 0
     for subdir in subdirs:
-        concat_file = subdir / "Concat.pdf"
-        if not concat_file.is_file():
-            print(f"Warning: file not found: {concat_file}", file=sys.stderr)
+        concat_file = next(
+            (
+                candidate
+                for candidate in (subdir / "Concat.pdf", subdir / "Concat.jpg")
+                if candidate.is_file()
+            ),
+            None,
+        )
+        if concat_file is None:
+            print(
+                f"Warning: no Concat.pdf or Concat.jpg found in {subdir}",
+                file=sys.stderr,
+            )
             missing_outputs += 1
             continue
-        destination = sync_dir / f"{subdir.name}.pdf"
+        destination = sync_dir / f"{subdir.name}{concat_file.suffix.lower()}"
         method = replace_with_link_or_copy(concat_file, destination, prefer="hardlink")
         print(f"Exported: {destination} ({method})")
     return ExitCode.PARTIAL if missing_outputs else ExitCode.SUCCESS
@@ -44,12 +56,24 @@ def export_directory(
 
 def build_parser() -> argparse.ArgumentParser:
     parser = evaluation_parser("Export annotated PDFs to the tablet directory.")
+    parser.add_argument(
+        "annotation_dir",
+        nargs="?",
+        choices=ANNOTATION_DIRECTORIES,
+        default="BGnot",
+        help="Annotation directory to export (default: BGnot)",
+    )
     parser.add_argument("--refaire", action="store_true", help="Process only copies/labels defined in refaire.json")
     return parser
 
 
-def run(workspace: EvaluationWorkspace, *, refaire: bool = False) -> ExitCode:
-    return export_directory(workspace, "BRnot" if refaire else "BGnot")
+def run(
+    workspace: EvaluationWorkspace,
+    *,
+    annotation_dir: str = "BGnot",
+    refaire: bool = False,
+) -> ExitCode:
+    return export_directory(workspace, "BRnot" if refaire else annotation_dir)
 
 
 def main(argv: Sequence[str] | None = None) -> int:
@@ -57,7 +81,11 @@ def main(argv: Sequence[str] | None = None) -> int:
     return execute(
         parser,
         argv,
-        lambda args: run(workspace_from_args(args), refaire=args.refaire),
+        lambda args: run(
+            workspace_from_args(args),
+            annotation_dir=args.annotation_dir,
+            refaire=args.refaire,
+        ),
     )