Refaire session.

copienator/commands/export.py

@@ -3,7 +3,6 @@ import sys
 from collections.abc import Sequence
 from pathlib import Path
 
-from copienator.configuration import EXPORT_DIR
 from copienator import (
     EvaluationWorkspace,
     ExitCode,
@@ -11,6 +10,7 @@ from copienator import (
     execute,
     workspace_from_args,
 )
+from copienator.configuration import EXPORT_DIR
 from copienator.platform import replace_with_link_or_copy
 
 ANNOTATION_DIRECTORIES = ("BGnot", "Bnot", "Anot")
@@ -21,8 +21,12 @@ def export_directory(
     source_dir_name: str,
 ) -> ExitCode:
     workspace.require_directories(source_dir_name)
-    source_dir = workspace.root / source_dir_name
+    source_dir = workspace.annotation_dir("refaire") if source_dir_name == "BRnot" else workspace.root / source_dir_name
+    session_id = workspace.refaire_session_id if source_dir_name == "BRnot" else None
+    prefix = f"{session_id}__" if session_id else ""
     sync_dir = Path(EXPORT_DIR).expanduser() / workspace.name
+    if session_id:
+        sync_dir /= session_id
     sync_dir.mkdir(parents=True, exist_ok=True)
 
     subdirs = [directory for directory in source_dir.iterdir() if directory.is_dir()]
@@ -48,7 +52,7 @@ def export_directory(
             )
             missing_outputs += 1
             continue
-        destination = sync_dir / f"{subdir.name}{concat_file.suffix.lower()}"
+        destination = sync_dir / f"{prefix}{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

copienator/commands/import_annotations.py

@@ -4,7 +4,6 @@ import sys
 from collections.abc import Sequence
 from pathlib import Path
 
-from copienator.configuration import IMPORT_DIR
 from copienator import (
     EvaluationWorkspace,
     ExitCode,
@@ -12,6 +11,7 @@ from copienator import (
     execute,
     workspace_from_args,
 )
+from copienator.configuration import IMPORT_DIR
 
 ANNOTATION_DIRECTORIES = ("BGnot", "Bnot", "Anot")
 
@@ -23,7 +23,10 @@ def sync_annotated(
     import_dir: Path,
 ) -> ExitCode:
     workspace.require_directories(annotation_dir_name)
-    annotation_dir = workspace.root / annotation_dir_name
+    annotation_dir = workspace.annotation_dir("refaire") if annotation_dir_name == "BRnot" else workspace.root / annotation_dir_name
+    session_id = workspace.refaire_session_id if annotation_dir_name == "BRnot" else None
+    prefix = f"{session_id}__" if session_id else ""
+    accepted = 0
     annotated_dir = Path(import_dir).expanduser()
     if not annotated_dir.is_dir():
         print(f"Error: directory does not exist: {annotated_dir}", file=sys.stderr)
@@ -39,7 +42,10 @@ def sync_annotated(
         key=lambda path: path.name.casefold(),
     )
     for annotated_file in annotated_files:
-        target_subdir = annotation_dir / annotated_file.stem
+        if prefix and not annotated_file.stem.startswith(prefix):
+            print(f"Ignoring return from another pass: {annotated_file.name}")
+            continue
+        target_subdir = annotation_dir / annotated_file.stem.removeprefix(prefix)
 
         if not target_subdir.is_dir():
             print(f"Warning: directory not found: {target_subdir}", file=sys.stderr)
@@ -49,6 +55,10 @@ def sync_annotated(
             dest_file = target_subdir / f"Concat_annotated{suffix}"
             print(f"Copying {annotated_file} to {dest_file}")
             shutil.copy2(annotated_file, dest_file)
+            accepted += 1
+    if prefix and not accepted:
+        print(f"No returns for the active pass {session_id} were imported.")
+        return ExitCode.PARTIAL
     return ExitCode.PARTIAL if missing_targets else ExitCode.SUCCESS