Merge branch 'bf/bids' into 'master'

Bf/bids

See merge request fsl/fslpy!194

CHANGELOG.rst

@@ -2,6 +2,17 @@ This document contains the ``fslpy`` release history in reverse chronological
 order.
 
 
+2.8.1 (Under development)
+-------------------------
+
+
+Fixed
+^^^^^
+
+
+* Fixed a bug where an error would be raised on attempts to load an image file
+  without a BIDS-compatible name from a BIDS-like directory.
+
 
 2.8.0 (Wednesday 29th January 2020)
 -----------------------------------

fsl/data/image.py

@@ -1540,7 +1540,8 @@ def loadMetadata(image):
     basename = op.basename(removeExt(filename))
     dirname  = op.dirname(filename)
 
-    if fslbids.inBIDSDir(image.dataSource):
+    if fslbids.isBIDSFile(image.dataSource) and \
+       fslbids.inBIDSDir( image.dataSource):
         return fslbids.loadMetadata(image.dataSource)
 
     jsonfile = op.join(dirname, '{}.json'.format(basename))

tests/test_image.py

@@ -1401,6 +1401,25 @@ def test_loadMeta():
         assert img.getMeta('b') == 2
 
 
+def test_loadMeta_nonBids():
+    with tempdir():
+
+        # non-bids file in a BIDS-like directory
+        imgfile  = op.join('data', 'sub-01', 'anat', 'sub-01_T1w_nonbids.nii.gz')
+
+        os.makedirs(op.dirname(imgfile))
+
+        make_image(imgfile)
+
+        with open(op.join('data', 'dataset_description.json'), 'wt') as f:
+            pass
+
+
+        img = fslimage.Image(imgfile, loadMeta=True)
+        assert list(img.metaKeys()) == []
+
+
+
 def test_loadMetadata():
     with tempdir():
         make_image('image.nii.gz')