Changes to "add_taskname_to_infofile"

It handles now either a path or a list of paths of json files.
The setting of the "TaskName" is removed from "embed_metadata_from_dicoms".
Addresses some change requests in PR #470

Author: pvelasco

heudiconv/convert.py

@@ -4,6 +4,7 @@
 import logging
 import shutil
 import sys
+import re
 
 from .utils import (
     read_config,
@@ -321,9 +322,13 @@ def convert(items, converter, scaninfo_suffix, custom_callable, with_prov,
                         % (outname)
                     )
 
+        # add the taskname field to the json file(s):
+        add_taskname_to_infofile( bids_outfiles )
+
         if len(bids_outfiles) > 1:
-            for bids_outfile in bids_outfiles:
-                add_taskname_to_infofile( bids_outfile )
+            lgr.warning("For now not embedding BIDS and info generated "
+                        ".nii.gz itself since sequence produced "
+                        "multiple files")
         elif not bids_outfiles:
             lgr.debug("No BIDS files were produced, nothing to embed to then")
         elif outname:
@@ -629,28 +634,30 @@ def save_converted_files(res, item_dicoms, bids_options, outtype, prefix, outnam
     return bids_outfiles
 
 
-def  add_taskname_to_infofile(infofile):
+def  add_taskname_to_infofile(infofiles):
     """Add the "TaskName" field to json files corresponding to func images.
 
     Parameters
     ----------
-    infofile : filename of json file
+    infofiles : list with json filenames or single filename
 
     Returns
     -------
     """
 
-    import re
-
-    meta_info = load_json(infofile)
-
-    try:
-        meta_info['TaskName'] = (re.search('(?<=_task-)\w+',
-                                           op.basename(infofile))
-                                 .group(0).split('_')[0])
-    except AttributeError:
-        lgr.warning("Failed to find task field in {0}.".format(infofile))
-        return
+    # in case they pass a string with a path:
+    if not isinstance(infofiles, list):
+        infofiles = [infofiles]
+
+    for infofile in infofiles:
+        meta_info = load_json(infofile)
+        try:
+            meta_info['TaskName'] = (re.search('(?<=_task-)\w+',
+                                               op.basename(infofile))
+                                     .group(0).split('_')[0])
+        except AttributeError:
+            lgr.warning("Failed to find task field in {0}.".format(infofile))
+            continue
 
-    # write to outfile
-    save_json(infofile, meta_info)
+        # write to outfile
+        save_json(infofile, meta_info)