Solver: Fix case of space into solver path.

This commit is contained in:
Pierre-Antoine Rouby committed 2023-08-04 17:20:23 +02:00
1 parent 06b6d59494
commit 02dafd4694
2 files changed
+33 -8

No files matched your search

+32 -7
View File
@@ -189,10 +189,19 @@ class AbstractSolver(object):
logger.debug(f"! {cmd}")
cmd = cmd.split()
exe = cmd[0]
if cmd[0] == "\"":
# Command line executable path is between " char
cmd = cmd.split("\"")
exe = cmd[1]
args = "\"".join(cmd[3:]).split(" ")
else:
# We suppose the command line executable path as no space char
cmd = cmd.replace("\ ", "&_&").split(" ")
exe = cmd[0].replace("&_&", "\ ")
args = cmd[1:]
logger.info(f"! {exe} {args}")
if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists"
logger.info(error)
@@ -215,12 +224,21 @@ class AbstractSolver(object):
cmd = cmd.replace("@input", self.input_param())
cmd = cmd.replace("@dir", self._process.workingDirectory())
logger.debug(f"! {cmd}")
logger.info(f"! {cmd}")
cmd = cmd.split()
exe = cmd[0]
if cmd[0] == "\"":
# Command line executable path is between " char
cmd = cmd.split("\"")
exe = cmd[1]
args = "\"".join(cmd[3:]).split(" ")
else:
# We suppose the command line executable path as no space char
cmd = cmd.replace("\ ", "&_&").split(" ")
exe = cmd[0].replace("&_&", "\ ")
args = cmd[1:]
logger.info(f"! {exe} {args}")
if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists"
logger.info(error)
@@ -246,8 +264,15 @@ class AbstractSolver(object):
logger.debug(f"! {cmd}")
cmd = cmd.split()
exe = cmd[0]
if cmd[0] == "\"":
# Command line executable path is between " char
cmd = cmd.split("\"")
exe = cmd[1]
args = "\"".join(cmd[3:]).split(" ")
else:
# We suppose the command line executable path as no space char
cmd = cmd.replace("\ ", "&_&").split(" ")
exe = cmd[0].replace("&_&", "\ ")
args = cmd[1:]
if not os.path.exists(exe):
+1 -1
View File
@@ -254,7 +254,7 @@ class Config(SQL):
ctor = solver_type_list["mage8"]
new = ctor("default-mage")
new._description = "Default PAMHYR mage 8 version"
new._cmd_solver = f"""@install_dir/mage/mage{"" if posix else ".exe"} -fp=1 @input"""
new._cmd_solver = f""""@install_dir/mage/mage{"" if posix else ".exe"}" -fp=1 @input"""
self._solvers.append(new)
# Meshing tool