parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solver: Fix case of space into solver path.

results
Pierre-Antoine Rouby 2023-08-04 17:17:42 +02:00
parent 06b6d59494
commit 02dafd4694
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Solver/ASolver.py
View File

@ -189,9 +189,18 @@ class AbstractSolver(object):
logger.debug(f"! {cmd}") logger.debug(f"! {cmd}")
cmd = cmd.split() if cmd[0] == "\"":
exe = cmd[0] # Command line executable path is between " char
args = cmd[1:] 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): if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists" error = f"[ERROR] Path {exe} do not exists"
@ -215,11 +224,20 @@ class AbstractSolver(object):
cmd = cmd.replace("@input", self.input_param()) cmd = cmd.replace("@input", self.input_param())
cmd = cmd.replace("@dir", self._process.workingDirectory()) cmd = cmd.replace("@dir", self._process.workingDirectory())
logger.debug(f"! {cmd}") logger.info(f"! {cmd}")
cmd = cmd.split() if cmd[0] == "\"":
exe = cmd[0] # Command line executable path is between " char
args = cmd[1:] 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): if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists" error = f"[ERROR] Path {exe} do not exists"
@ -246,9 +264,16 @@ class AbstractSolver(object):
logger.debug(f"! {cmd}") logger.debug(f"! {cmd}")
cmd = cmd.split() if cmd[0] == "\"":
exe = cmd[0] # Command line executable path is between " char
args = cmd[1:] 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): if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists" error = f"[ERROR] Path {exe} do not exists"

2
src/config.py
View File

@ -254,7 +254,7 @@ class Config(SQL):
ctor = solver_type_list["mage8"] ctor = solver_type_list["mage8"]
new = ctor("default-mage") new = ctor("default-mage")
new._description = "Default PAMHYR mage 8 version" 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) self._solvers.append(new)
# Meshing tool # Meshing tool