refactor4

Author: chrisgorgo

tests/nii.spec.js

@@ -91,12 +91,12 @@ describe('NIFTI', function(){
     it('should generate warning if files listed in IntendedFor of fieldmap json do not exist', function() {
       var file = {
           name: 'sub-09_ses-test_run-01_fieldmap.nii.gz',
-          path: '/ds114/sub-09/ses-test/dwi/sub-09_ses-test_run-01_fieldmap.nii.gz',
-          relativePath: '/sub-09/ses-test/dwi/sub-09_ses-test_run-01_fieldmap.nii.gz'
+          path: '/ds114/sub-09/ses-test/fmap/sub-09_ses-test_run-01_fieldmap.nii.gz',
+          relativePath: '/sub-09/ses-test/fmap/sub-09_ses-test_run-01_fieldmap.nii.gz'
       };
 
       var jsonContentsDict = {
-          '/sub-09/ses-test/dwi/sub-09_ses-test_run-01_fieldmap.json': {
+          '/sub-09/ses-test/fmap/sub-09_ses-test_run-01_fieldmap.json': {
               TaskName: 'Mixed Event Related Probe',
               IntendedFor: ['func/sub-15_task-mixedeventrelatedprobe_run-05_bold.nii.gz','func/sub-15_task-mixedeventrelatedprobe_run-02_bold.nii.gz'
             ]

utils/type.js

@@ -155,6 +155,17 @@ module.exports = {
         return conditionalMatch(anatRe, path);
     },
 
+    isFieldMapMainNii: function (path) {
+        var suffixes = ["phasediff", "phase1", "phase2", "fieldmap", "epi"];
+        var anatRe = new RegExp('^\\/(sub-[a-zA-Z0-9]+)' +
+            '\\/(?:(ses-[a-zA-Z0-9]+)' +
+            '\\/)?fmap' +
+            '\\/\\1(_\\2)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_dir-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?_(?:'
+            + suffixes.join("|")
+            + ').(nii.gz|nii)$');
+        return conditionalMatch(anatRe, path);
+    },
+
     /**
      * Check if the file has a name appropriate for a functional scan
      */

validators/nii.js

@@ -239,9 +239,7 @@ module.exports = function NIFTI (header, file, jsonContentsDict, bContentsDict,
             }
         }
 
-        if (path.includes("_phasediff.nii") || path.includes("_phase1.nii") ||
-            path.includes("_phase2.nii") || path.includes("_fieldmap.nii") || path.includes("_epi.nii") &&
-            mergedDictionary.hasOwnProperty('IntendedFor')) {
+        if (utils.type.isFieldMapMainNii(path) && mergedDictionary.hasOwnProperty('IntendedFor')) {
             var intendedFor = typeof mergedDictionary['IntendedFor'] == "string" ? [mergedDictionary['IntendedFor']] : mergedDictionary['IntendedFor'];
 
             for (var key = 0; key < intendedFor.length; key++) {