[FIX] Sanitize plus signs in from entities in workflow names (#3604)

Author: bpinsard

fmriprep/workflows/bold/base.py

@@ -877,8 +877,10 @@ def _get_wf_name(bold_fname, prefix):
     from nipype.utils.filemanip import split_filename
 
     fname = split_filename(bold_fname)[1]
-    fname_nosub = '_'.join(fname.split('_')[1:-1])
-    return f'{prefix}_{fname_nosub.replace("-", "_")}_wf'
+    fname_sanitized = '_'.join(fname.split('_')[1:-1])
+    for char in '-+':
+        fname_sanitized = fname_sanitized.replace(char, '_')
+    return f'{prefix}_{fname_sanitized}_wf'
 
 
 def extract_entities(file_list):

fmriprep/workflows/tests/test_base.py

@@ -255,6 +255,27 @@ def test_init_fmriprep_wf_sanitize_fmaps(tmp_path):
     generate_expanded_graph(wf._create_flat_graph())
 
 
+def test_init_fmriprep_wf_sanitize_plus(tmp_path):
+    bids_dir = tmp_path / 'bids'
+
+    spec = deepcopy(BASE_LAYOUT)
+    spec['01']['func'][0]['acquisition'] = 'mb4+pf68th'
+    spec['01']['anat'][0]['acquisition'] = 'memprage+rms'
+    spec['01']['anat'][1]['acquisition'] = 'memprage'
+    spec['01']['fmap'][2]['acquisition'] = 'sbref+pf68th'
+    spec['01']['fmap'][3]['acquisition'] = 'sbref+pf68th'
+    del spec['01']['func'][4:]
+
+    generate_bids_skeleton(bids_dir, spec)
+    img = nb.Nifti1Image(np.zeros((10, 10, 10, 10)), np.eye(4))
+    for img_path in bids_dir.glob('sub-01/*/*.nii.gz'):
+        img.to_filename(img_path)
+
+    with mock_config(bids_dir=bids_dir):
+        wf = init_fmriprep_wf()
+    generate_expanded_graph(wf._create_flat_graph())
+
+
 def test_get_estimator_none(tmp_path):
     bids_dir = tmp_path / 'bids'