fix tests, use BIDSFile for renaming

Author: bpinsard

heudiconv/convert.py

@@ -20,6 +20,7 @@
 from .bids import (
     BIDS_VERSION,
     BIDSError,
+    BIDSFile,
     add_participant_record,
     populate_bids_templates,
     populate_intended_for,
@@ -525,9 +526,11 @@ def update_multiorient_name(
     metadata: dict[str, Any],
     filename: str,
 ) -> str:
-    if "_acq-" in filename:
+    bids_file = BIDSFile.parse(filename)
+    if bids_file["acq"]:
         lgr.warning(
-            "Not embedding multi-orientation information as `%r` already uses acq- parameter.", filename
+            "Not embedding multi-orientation information as `%r` already uses acq- parameter.",
+            filename,
         )
         return filename
     iop = metadata.get("ImageOrientationPatientDICOM")
@@ -539,14 +542,8 @@ def update_multiorient_name(
     ]
     cross_prod = [abs(x) for x in cross_prod]
     slice_orient = ["sagittal", "coronal", "axial"][cross_prod.index(1)]
-    bids_pairs = filename.split("_")
-    # acq needs to be inserted right after sub- or ses-
-    ses_or_sub_idx = sum(
-        [bids_pair.split("-")[0] in ["sub", "ses"] for bids_pair in bids_pairs]
-    )
-    bids_pairs.insert(ses_or_sub_idx, "acq-%s" % slice_orient)
-    filename = "_".join(bids_pairs)
-    return filename
+    bids_file["acq"] = slice_orient
+    return str(bids_file)
 
 
 def convert(

heudiconv/tests/test_bids.py

@@ -1369,7 +1369,6 @@ def test_BIDSFile() -> None:
     assert my_bids_file["echo"] == "2"
 
 
-@pytest.mark.skipif(not have_datalad, reason="no datalad")
 def test_convert_multiorient(
     tmp_path: Path,
     heuristic: str = "bids_localizer.py",

heudiconv/tests/test_convert.py

@@ -151,7 +151,7 @@ def test_update_multiorient_name() -> None:
     # Standard name update
     base_fn = "sub-X_ses-Y_task-Z_run-01_bold"
     metadata = {"ImageOrientationPatientDICOM": [0, 1, 0, 0, 0, -1]}
-    out_fn_true = "sub-X_ses-Y_acq-sagittal_task-Z_run-01_bold"
+    out_fn_true = "sub-X_ses-Y_task-Z_acq-sagittal_run-01_bold"
     out_fn_test = update_multiorient_name(metadata, base_fn)
     assert out_fn_test == out_fn_true