Configuration de l'output final

copienator/commands/giving_names.py

@@ -10,12 +10,14 @@ from pathlib import Path
 from copienator import (
     EvaluationWorkspace,
     ExitCode,
+    configuration,
     evaluation_parser,
     execute,
     read_json,
     workspace_from_args,
 )
 from copienator.platform import replace_with_link_or_copy, safe_filename
+from copienator.return_answers import publish_answer_returns
 
 ANNOTATION_CHOICES = ("BGnot", "Bnot", "Anot")
 
@@ -94,9 +96,10 @@ def prepare_named_returns(
             fallback = fallback_annotations / f"Copie{copy_id}"
             source_folder = None
             for candidate in (selected, fallback):
-                if (candidate / "Concat.jpg").exists() and (
-                    candidate / "score.json"
-                ).exists():
+                if (candidate / "score.json").is_file() and (
+                    (candidate / "Concat.jpg").is_file()
+                    or (candidate / "info.json").is_file()
+                ):
                     source_folder = candidate
                     break
             if source_folder is None:
@@ -105,19 +108,31 @@ def prepare_named_returns(
             assigned_names.add(name)
             destination = workspace.return_dir / f"{safe_name} ({copy_id})"
             destination.mkdir(parents=True, exist_ok=True)
+            try:
+                publish_answer_returns(workspace.root, source_folder, destination)
+            except (OSError, TypeError, ValueError) as exc:
+                print(f"Error preparing answers for {destination.name}: {exc}", file=sys.stderr)
+                had_errors = True
+                continue
             links = (
-                ("Concat.jpg", f"{safe_name}.jpg"),
-                ("Concat_F.pdf", f"{safe_name}.pdf"),
-                ("score.json", "score.json"),
+                ("Concat.jpg", f"{safe_name}.jpg", configuration.RETURN_JPEG_ENABLED),
+                ("Concat_F.pdf", f"{safe_name}.pdf", configuration.RETURN_PDF_ENABLED),
+                ("score.json", "score.json", True),
             )
-            for source_name, destination_name in links:
+            for source_name, destination_name, enabled in links:
                 source = source_folder / source_name
-                if not source.exists():
-                    continue
+                target = destination / destination_name
                 try:
+                    if not enabled:
+                        # Remove only the named return entry, never its link target.
+                        target.unlink(missing_ok=True)
+                        continue
+                    if not source.exists():
+                        target.unlink(missing_ok=True)
+                        continue
                     method = replace_with_link_or_copy(
                         source,
-                        destination / destination_name,
+                        target,
                         prefer="symlink",
                     )
                     if method == "copy":
@@ -163,4 +178,3 @@ def main(argv: Sequence[str] | None = None) -> int:
 
 if __name__ == "__main__":
     raise SystemExit(main())
-