pre clean every string parameter for Boost

Author: Tom Wagg

preProcessing/pythonSubmit.py

@@ -25,7 +25,7 @@ class pythonProgramOptions:
     # in the bin directory (rather than the src directory)
     compas_executable_override = os.environ.get('COMPAS_EXECUTABLE_PATH')
     print('compas_executable_override', compas_executable_override)
-    
+
     if (compas_executable_override is None):
         git_directory = os.environ.get('COMPAS_ROOT_DIR')
         compas_executable = os.path.join(git_directory, 'src/COMPAS')
@@ -50,7 +50,7 @@ class pythonProgramOptions:
     # if COMPAS_LOGS_OUTPUT_DIR_PATH is not set (== None) the current working directory
     # is used as the value for the --output-path option
     compas_logs_output_override = os.environ.get('COMPAS_LOGS_OUTPUT_DIR_PATH')
-    
+
     if (compas_logs_output_override is None):
         output = os.getcwd()
         output_container = None                 # names the directory to be created and in which log files are created.  Default in COMPAS is "COMPAS_Output"
@@ -210,7 +210,7 @@ class pythonProgramOptions:
 
     neutrino_mass_loss_BH_formation = "FIXED_MASS"              # "FIXED_FRACTION"
     neutrino_mass_loss_BH_formation_value = 0.1                 # Either fraction or mass (Msol) to lose
-    
+
     remnant_mass_prescription   = 'FRYER2012'                   #
     fryer_supernova_engine      = 'DELAYED'
     black_hole_kicks            = 'FALLBACK'
@@ -299,17 +299,6 @@ class pythonProgramOptions:
     debug_to_file  = False
     errors_to_file = False
 
-    # ensure that no file paths have unescaped spaces that could confuse Boost
-    paths = [output, grid_filename, logfile_definitions, logfile_common_envelopes, logfile_detailed_output,
-             logfile_double_compact_objects, logfile_rlof_parameters, logfile_pulsar_evolution,
-             logfile_supernovae, logfile_switch_log, logfile_system_parameters]
-    for i in range(len(paths)):
-        if paths[i] is not None:
-            paths[i] = re.sub(r"(?<!\\) ", r"\ ", paths[i])
-    output, grid_filename, logfile_definitions, logfile_common_envelopes, logfile_detailed_output,\
-        logfile_double_compact_objects, logfile_rlof_parameters, logfile_pulsar_evolution,\
-        logfile_supernovae, logfile_switch_log, logfile_system_parameters = paths
-
     def booleanChoices(self):
         booleanChoices = [
             self.enable_warnings,
@@ -668,12 +657,12 @@ def generateCommandLineOptionsDict(self):
         and run directly as a terminal command, or passed to the stroopwafel interface
         where some of them may be overwritten. Options not to be included in the command 
         line should be set to pythons None (except booleans, which should be set to False)
-    
+
         Parameters
         -----------
         self : pythonProgramOptions
             Contains program options
-    
+
         Returns
         --------
         commands : str or list of strs
@@ -682,17 +671,17 @@ def generateCommandLineOptionsDict(self):
         booleanCommands = self.booleanCommands()
         nBoolean = len(booleanChoices)
         assert len(booleanCommands) == nBoolean
-    
+
         numericalChoices = self.numericalChoices()
         numericalCommands = self.numericalCommands()
         nNumerical = len(numericalChoices)
         assert len(numericalCommands) == nNumerical
-    
+
         stringChoices = self.stringChoices()
         stringCommands = self.stringCommands()
         nString = len(stringChoices)
         assert len(stringCommands) == nString
-    
+
         listChoices = self.listChoices()
         listCommands = self.listCommands()
         nList = len(listChoices)
@@ -702,23 +691,23 @@ def generateCommandLineOptionsDict(self):
         ### Collect all options into a dictionary mapping option name to option value
 
         command = {'compas_executable' : self.compas_executable}
-    
+
         for i in range(nBoolean):
             if booleanChoices[i] == True:
                 command.update({booleanCommands[i] : ''})
-    
+
         for i in range(nNumerical):
             if not numericalChoices[i] == None:
                 command.update({numericalCommands[i] : str(numericalChoices[i])})
-    
+
         for i in range(nString):
             if not stringChoices[i] == None:
-                command.update({stringCommands[i] : stringChoices[i]})
-    
+                command.update({stringCommands[i] : cleanStringParameter(stringChoices[i])})
+
         for i in range(nList):
             if listChoices[i]:
                 command.update({listCommands[i] : ' '.join(map(str,listChoices[i]))})
-    
+
         return command
 
 
@@ -730,13 +719,20 @@ def combineCommandLineOptionsDictIntoShellCommand(commandOptions):
     """
 
     shellCommand = commandOptions['compas_executable']
-    del commandOptions['compas_executable'] 
+    del commandOptions['compas_executable']
     for key, val in commandOptions.items():
         shellCommand += ' ' + key + ' ' + val
 
     return shellCommand
 
 
+def cleanStringParameter(str_param):
+    """ strip quotes and escape spaces to avoid confusing Boost """
+    if str_param is not None:
+        str_param = re.sub(r"(?<!\\) ", r"\ ", str_param).replace("'", "").replace('"', '')
+    return str_param
+
+
 if __name__ == "__main__":
 
     #-- Get the program options