Merge pull request #243 from girder/harden-parser

Harden parsing CLI --xml to ignore stray lines

Author: manthey

slicer_cli_web/cli_list_entrypoint.py

@@ -65,7 +65,7 @@ def CLIListEntrypoint(cli_list_spec_file=None, cwd=None):
         formatter_class=_MultilineHelpFormatter
     )
 
-    # add --cli_list
+    # add --list_cli
     cmdparser.add_argument(
         '--list_cli',
         action=_make_print_cli_list_spec_action(cli_list_spec_file),

slicer_cli_web/image_job.py

@@ -315,6 +315,13 @@ def getCliData(name, client, job):
             if isinstance(cli_desc, bytes):
                 cli_desc = cli_desc.decode('utf8')
 
+            # For --xml, strip text before the first < and after the last >
+            if desc_type == 'xml':
+                cli_desc = '<' + cli_desc.split('<', 1)[1].rsplit('>', 1)[0] + '>'
+            # For --json, strip text before the first { and after the last }
+            elif desc_type == 'json':
+                cli_desc = '{' + cli_desc.split('{', 1)[1].rsplit('}', 1)[0] + '}'
+
             cli_dict[key][desc_type] = cli_desc
             job = Job().updateJob(
                 job,