From 48aa5cb1aae4231c7103edda1936e1e07edb7582 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Tue, 26 Mar 2024 15:29:45 +0100
Subject: [PATCH] Config: Update config with new mage_fake7 solver and new mage
path.
---
src/Solver/Mage.py | 1 -
src/config.py | 27 +++++++++++++++++++++++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index 7da2328a..dc95c510 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -1231,7 +1231,6 @@ class Mage8(Mage):
return results
-
class MageFake7(Mage8):
_type = "mage_fake7"
diff --git a/src/config.py b/src/config.py
index f18708d7..9258486d 100644
--- a/src/config.py
+++ b/src/config.py
@@ -37,7 +37,7 @@ logger = logging.getLogger()
class Config(SQL):
def __init__(self):
- self._version = '0.0.4'
+ self._version = '0.0.5'
self.filename = Config.filename()
self.set_default_value()
@@ -132,6 +132,28 @@ class Config(SQL):
"VALUES ('last_solver_name', '')"
)
+ if int(release) < 5:
+ posix = os.name == 'posix'
+ ext = "" if posix else ".exe"
+
+ self.execute(
+ "UPDATE solver SET cmd_solver=" +
+ f"'@install_dir/mage8/mage{ext} @args @input' "
+ "WHERE name='default-mage'"
+ )
+
+ self.execute(f"""
+ INSERT INTO solver VALUES (
+ 'mage_fake7',
+ 'default-mage-fake-7',
+ 'Default Pamhyr2 mage fake version 7',
+ '', '', '',
+ '',
+ '@install_dir/mage8/mage_as7{ext} @args @input',
+ ''
+ )
+ """)
+
self.execute(
f"UPDATE info SET value='{self._version}' " +
"WHERE key='version'"
@@ -296,7 +318,8 @@ class Config(SQL):
ctor = solver_type_list["mage_fake7"]
new = ctor("default-mage-fake-7")
new._description = "Default Pamhyr2 mage fake version 7"
- new._cmd_solver = f""""@install_dir/mage8/mage_as7{ext}" @args @input"""
+ new._cmd_solver = f"""\
+"@install_dir/mage8/mage_as7{ext}" @args @input"""
self._solvers.append(new)
# Backup
--
GitLab