use bids.File

Author: Remi-Gau

src/spm_2_bids.m

@@ -136,12 +136,18 @@
 
     overwrite = true;
     spec.prefix = '';
-    spec.use_schema = false;
+    use_schema = false;
     p = set_missing_fields(p, spec, overwrite);
 
     p = reorder_entities(p, cfg);
 
-    [new_filename, pth, json] = bids.create_filename(p, file);
+    bidsFile = bids.File(file, use_schema, p);
+    bidsFile = bidsFile.reorder_entities(p.entity_order);
+    bidsFile = bidsFile.create_filename;
+
+    new_filename = bidsFile.filename;
+    pth = bidsFile.pth;
+    json = bids.derivatives_json(new_filename);
 
     % TODO update json content
     p = bids.internal.parse_filename(file);

tests/test_spm_2_bids.m

@@ -8,10 +8,19 @@
     initTestSuite;
 end
 
+function test_spm_2_bids_order_entities()
+
+    file = 'wmsub-01_desc-skullstripped_T1w.nii';
+    new_filename = spm_2_bids(file);
+    assertEqual(new_filename, 'sub-01_space-IXI549Space_desc-preproc_T1w.nii');
+
+end
+
 function test_spm_2_bids_suffix()
 
     input_output = {
-                    'sub-01_T1w_seg8.mat', 'sub-01_label-T1w_segparam.mat'; ...
+                    'sub-01_T1w_seg8.mat', ...
+                    'sub-01_label-T1w_segparam.mat'
                     'sub-01_task-auditory_bold_uw.mat', ...
                     'sub-01_task-auditory_label-bold_unwarpparam.mat'};
 
@@ -73,14 +82,6 @@ function test_spm_2_bids_new_mapping()
 
 end
 
-function test_spm_2_bids_order_entities()
-
-    file = 'wmsub-01_desc-skullstripped_T1w.nii';
-    new_filename = spm_2_bids(file);
-    assertEqual(new_filename, 'sub-01_space-IXI549Space_desc-preproc_T1w.nii');
-
-end
-
 function test_spm_2_bids_no_prefix()
 
     file = 'sub-01_ses-02_T1w.nii';