Merge pull request #82 from dartmouth-pbs/bf-bids-layout-assumption

BF: do not try to produce scans files if layout is not fully BIDS yet

Author: satra

bin/heudiconv

@@ -1031,8 +1031,9 @@ def _find_subj_ses(f_name):
     # we will allow the match at either directories or within filename
     # assuming that bids layout is "correct"
     regex = re.compile('sub-(?P<subj>[a-zA-Z0-9]*)([/_]ses-(?P<ses>[a-zA-Z0-9]*))?')
-    res = regex.search(f_name).groupdict()
-    return res.get('subj'), res.get('ses', None)
+    regex_res = regex.search(f_name)
+    res = regex_res.groupdict() if regex_res else {}
+    return res.get('subj', None), res.get('ses', None)
 
 
 def save_scans_key(item, bids_files):
@@ -1059,6 +1060,13 @@ def save_scans_key(item, bids_files):
         f_name = f_name.replace('json', 'nii.gz')
         rows[f_name] = get_formatted_scans_key_row(item)
         subj_, ses_ = _find_subj_ses(f_name)
+        if not subj_:
+            lgr.warning(
+                "Failed to detect fullfilled BIDS layout.  "
+                "No scans.tsv file(s) will be produced for %s",
+                ", ".join(bids_files)
+            )
+            return
         if subj and subj_ != subj:
             raise ValueError(
                 "We found before subject %s but now deduced %s from %s"