From e21888e2e911bb7425cf1ed6ef51356d307c46d9 Mon Sep 17 00:00:00 2001 From: Chris Filo Gorgolewski Date: Sun, 29 Jul 2018 14:50:17 -0700 Subject: [PATCH 1/6] Removal of fif.gz --- validators/bids.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validators/bids.js b/validators/bids.js index b9945047a..cd272c3dd 100644 --- a/validators/bids.js +++ b/validators/bids.js @@ -246,7 +246,7 @@ BIDS = { } // check nifti and MEG files - else if (RegExp('^.*\.(nii|nii\.gz|fif|fif\.gz|sqd|con|kdf|chn|trg|raw|raw\.mhf)$').test(file.name)) { + else if (RegExp('^.*\.(nii|nii\.gz|fif|sqd|con|kdf|chn|trg|raw|raw\.mhf)$').test(file.name)) { // capture nifties for later validation if (file.name.endsWith('.nii') || file.name.endsWith('.nii.gz')) {niftis.push(file);} From 210d6e6963f44eb2d0f26eabd57eaac7e7cc48ac Mon Sep 17 00:00:00 2001 From: Chris Filo Gorgolewski Date: Sun, 29 Jul 2018 14:51:08 -0700 Subject: [PATCH 2/6] removal of fif.gz --- utils/type.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/type.js b/utils/type.js index ff8cd1054..9b2063135 100644 --- a/utils/type.js +++ b/utils/type.js @@ -200,7 +200,7 @@ module.exports = { '\\/(?:(ses-[a-zA-Z0-9]+)' + '\\/)?meg' + '\\/\\1(_\\2)?(?:_task-[a-zA-Z0-9]+)?(?:_acq-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_proc-[a-zA-Z0-9]+)?(?:_part-[0-9]+)?' + - '(_meg.(fif|fif.gz|sqd|con|kdf|chn|trg|raw|raw.mhd)|(_meg.ds\\/.*)|(_events.tsv|_channels.tsv|_meg.json|_coordsystem.json|_photo.jpg|_headshape.pos))$'); + '(_meg.(fif|sqd|con|kdf|chn|trg|raw|raw.mhd)|(_meg.ds\\/.*)|(_events.tsv|_channels.tsv|_meg.json|_coordsystem.json|_photo.jpg|_headshape.pos))$'); return conditionalMatch(MegRe, path); }, From 4cd9011dfa2004afffa46cd77409d6316709d8c9 Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Mon, 27 Aug 2018 10:15:39 -0700 Subject: [PATCH 3/6] updated examples version --- tests/bids.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bids.spec.js b/tests/bids.spec.js index fcaafceff..c2f4febab 100644 --- a/tests/bids.spec.js +++ b/tests/bids.spec.js @@ -8,7 +8,7 @@ var fs = require('fs') var AdmZip = require('adm-zip') var path = require('path') var Test = require('mocha/lib/test') -var test_version = '7817e60d06f74fd1b080db6942e5de36052d7242' +var test_version = '1.1.1' function getDirectories(srcpath) { return fs.readdirSync(srcpath).filter(function(file) { From 294f5f4ff15900ef838ad3429025bf29599f974e Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Mon, 27 Aug 2018 10:19:57 -0700 Subject: [PATCH 4/6] fix line break --- validators/bids.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/validators/bids.js b/validators/bids.js index ea1eba2b2..063a0447d 100644 --- a/validators/bids.js +++ b/validators/bids.js @@ -282,10 +282,7 @@ BIDS = { [ '^.*\\.(', 'nii|nii\\.gz|', // MRI - ' - - - |fif|sqd|con|kdf|chn|trg|raw|raw\\.mhf|', // MEG + 'fif|sqd|con|kdf|chn|trg|raw|raw\\.mhf|', // MEG 'eeg|vhdr|vmrk|edf|cnt|bdf|set|fdt|dat|nwb|tdat|tidx|tmet', // EEG/iEEG ')$', ].join(''), From 7485aa2c48bdce0b1e98d5f38a14b00902b1362a Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Mon, 27 Aug 2018 10:24:34 -0700 Subject: [PATCH 5/6] remove bonus new line --- validators/bids.js | 1 - 1 file changed, 1 deletion(-) diff --git a/validators/bids.js b/validators/bids.js index 063a0447d..394e64233 100644 --- a/validators/bids.js +++ b/validators/bids.js @@ -420,7 +420,6 @@ BIDS = { }) } - // validate bvec else if (file.name && file.name.endsWith('.bvec')) { utils.files.readFile(file, function(issue, contents) { From cf470c88d30c6edcd15171069d97f01eff6fa8c3 Mon Sep 17 00:00:00 2001 From: Chris Gorgolewski Date: Mon, 27 Aug 2018 10:56:09 -0700 Subject: [PATCH 6/6] updated version of the test dataset --- tests/bids.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bids.spec.js b/tests/bids.spec.js index c2f4febab..ad66a50fa 100644 --- a/tests/bids.spec.js +++ b/tests/bids.spec.js @@ -8,7 +8,7 @@ var fs = require('fs') var AdmZip = require('adm-zip') var path = require('path') var Test = require('mocha/lib/test') -var test_version = '1.1.1' +var test_version = '1.1.1u1' function getDirectories(srcpath) { return fs.readdirSync(srcpath).filter(function(file) {