AddFile: Activate scenarios.

This commit is contained in:
Pierre-Antoine Rouby committed 2024-08-26 15:03:05 +02:00
1 parent 8b9bb68ac5
commit 1cfc7e6638
4 files changed
+67 -20

No files matched your search

+33 -14
View File
@@ -30,10 +30,11 @@ class AddFile(SQLSubModel):
def __init__(self, id: int = -1, enabled=True,
name="", path="", text="",
status=None):
super(AddFile, self).__init__(id)
self._status = status
status=None, owner_scenario=-1):
super(AddFile, self).__init__(
id=id, status=status,
owner_scenario=owner_scenario
)
self._enabled = enabled
self._name = f"File #{self._pamhyr_id}" if name == "" else name
@@ -64,7 +65,7 @@ class AddFile(SQLSubModel):
elif key == "text":
self._text = value
self._status.modified()
self.modified()
@property
def enabled(self):
@@ -73,7 +74,7 @@ class AddFile(SQLSubModel):
@enabled.setter
def enabled(self, enabled):
self._enabled = enabled
self._status.modified()
self.modified()
def is_enabled(self):
return self._enabled
@@ -85,7 +86,7 @@ class AddFile(SQLSubModel):
@name.setter
def name(self, name):
self._name = name
self._status.modified()
self.modified()
@property
def path(self):
@@ -94,7 +95,7 @@ class AddFile(SQLSubModel):
@path.setter
def path(self, path):
self._path = path
self._status.modified()
self.modified()
@property
def text(self):
@@ -103,7 +104,7 @@ class AddFile(SQLSubModel):
@text.setter
def text(self, text):
self._text = text
self._status.modified()
self.modified()
@classmethod
def _db_create(cls, execute, ext=""):
@@ -158,10 +159,17 @@ class AddFile(SQLSubModel):
@classmethod
def _db_load(cls, execute, data=None):
new = []
scenario = data["scenario"]
loaded = data['loaded_pid']
if scenario is None:
return new
table = execute(
"SELECT pamhyr_id, enabled, name, path, text " +
"FROM additional_files"
"SELECT pamhyr_id, enabled, name, path, text, scenario " +
"FROM additional_files " +
f"WHERE scenario = {scenario.id} " +
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
)
for row in table:
@@ -172,25 +180,36 @@ class AddFile(SQLSubModel):
name = next(it)
path = next(it)
text = next(it)
owner_scenario = next(it)
f = cls(
id=id, enabled=enabled, name=name, path=path, text=text,
status=data['status']
status=data['status'], owner_scenario=owner_scenario
)
loaded.add(id)
new.append(f)
data["scenario"] = scenario.parent
new += cls._db_load(execute, data)
data["scenario"] = scenario
return new
def _db_save(self, execute, data=None):
if not self.must_be_saved():
return True
sql = (
"INSERT INTO " +
"additional_files(pamhyr_id, enabled, name, path, text) " +
"additional_files(pamhyr_id, enabled, " +
"name, path, text, scenario) " +
"VALUES (" +
f"{self._pamhyr_id}, {self._enabled}, " +
f"'{self._db_format(self._name)}', " +
f"'{self._db_format(self._path)}', " +
f"'{self._db_format(self._text)}'" +
f"'{self._db_format(self._text)}', " +
f"{self._status.scenario_id}"
")"
)
execute(sql)