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

import.py

@@ -13,43 +13,69 @@ from copienator import (
     workspace_from_args,
 )
 
+ANNOTATION_DIRECTORIES = ("BGnot", "Bnot", "Anot")
+
 
 def sync_annotated(
     workspace: EvaluationWorkspace,
     *,
-    refaire: bool = False,
+    annotation_dir_name: str,
     import_dir: Path,
 ) -> ExitCode:
-    annotation_name = "BRnot" if refaire else "BGnot"
-    workspace.require_directories(annotation_name)
-    annotation_dir = workspace.root / annotation_name
+    workspace.require_directories(annotation_dir_name)
+    annotation_dir = workspace.root / annotation_dir_name
     annotated_dir = Path(import_dir).expanduser()
     if not annotated_dir.is_dir():
         print(f"Error: directory does not exist: {annotated_dir}", file=sys.stderr)
         return ExitCode.INVALID_WORKSPACE
 
     missing_targets = 0
-    for pdf_file in annotated_dir.glob("*.pdf"):
-        target_subdir = annotation_dir / pdf_file.stem
+    annotated_files = sorted(
+        (
+            path
+            for path in annotated_dir.iterdir()
+            if path.is_file() and path.suffix.casefold() in {".pdf", ".jpg", ".jpeg"}
+        ),
+        key=lambda path: path.name.casefold(),
+    )
+    for annotated_file in annotated_files:
+        target_subdir = annotation_dir / annotated_file.stem
 
         if not target_subdir.is_dir():
             print(f"Warning: directory not found: {target_subdir}", file=sys.stderr)
             missing_targets += 1
         else:
-            dest_file = target_subdir / "Concat_annotated.pdf"
-            print(f"Copying {pdf_file} to {dest_file}")
-            shutil.copy2(pdf_file, dest_file)
+            suffix = annotated_file.suffix.lower()
+            dest_file = target_subdir / f"Concat_annotated{suffix}"
+            print(f"Copying {annotated_file} to {dest_file}")
+            shutil.copy2(annotated_file, dest_file)
     return ExitCode.PARTIAL if missing_targets else ExitCode.SUCCESS
 
 
 def build_parser() -> argparse.ArgumentParser:
     parser = evaluation_parser("Import handwritten annotations from the tablet directory.")
+    parser.add_argument(
+        "annotation_dir",
+        nargs="?",
+        choices=ANNOTATION_DIRECTORIES,
+        default="BGnot",
+        help="Annotation directory receiving imported PDFs (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 sync_annotated(workspace, refaire=refaire, import_dir=Path(IMPORT_DIR))
+def run(
+    workspace: EvaluationWorkspace,
+    *,
+    annotation_dir: str = "BGnot",
+    refaire: bool = False,
+) -> ExitCode:
+    return sync_annotated(
+        workspace,
+        annotation_dir_name="BRnot" if refaire else annotation_dir,
+        import_dir=Path(IMPORT_DIR),
+    )
 
 
 def main(argv: Sequence[str] | None = None) -> int:
@@ -57,7 +83,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,
+        ),
     )