diff --git a/src/Solver/Solvers.py b/src/Solver/Solvers.py index e1ced449669031aac04d27e9783d56c74cc1ca90..5ba4205f4526cb13ced07cad66c84805aacf584c 100644 --- a/src/Solver/Solvers.py +++ b/src/Solver/Solvers.py @@ -29,12 +29,12 @@ solver_long_name = { # "generic": "Generic", # "mage7": "Mage v7", "mage8": "Mage v8", - "mage_fake7": "Mage fake v7", + # "mage_fake7": "Mage fake v7", } solver_type_list = { # "generic": GenericSolver, # "mage7": Mage7, "mage8": Mage8, - "mage_fake7": MageFake7, + # "mage_fake7": MageFake7, } diff --git a/src/config.py b/src/config.py index 9258486d8f78f2ea111a9283d28df514977951da..790e5f671ba70079a9bf856f813758c62f4c4b4b 100644 --- a/src/config.py +++ b/src/config.py @@ -164,8 +164,18 @@ class Config(SQL): def _load_solver(self): self._solvers = [] + compatible_types = ', '.join( + map(lambda t: f"'{t}'", solver_type_list) + ) + + print( + "SELECT * FROM solver " + + f"WHERE type IN ({compatible_types})" + ) + solvers = self.execute( - "SELECT * FROM solver", + "SELECT * FROM solver " + + f"WHERE type IN ({compatible_types})", fetch_one=False ) for solver in solvers: @@ -315,12 +325,12 @@ class Config(SQL): self._solvers.append(new) # Mage fake 7 - 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""" - self._solvers.append(new) +# 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""" +# self._solvers.append(new) # Backup self.backup_enable = True