mirror of https://gitlab.com/pamhyr/pamhyr2
pamhyr: Fix save after backup and minor change.
parent
48e30125bb
commit
1ff895368e
|
|
@ -103,15 +103,16 @@ class Study(SQLModel):
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(e)
|
logger.error(e)
|
||||||
|
|
||||||
|
is_new = False
|
||||||
fname = fname + "." + str(self._old_save_id)
|
fname = fname + "." + str(self._old_save_id)
|
||||||
if os.path.exists(self.filename) and ".backup" not in self.filename:
|
if os.path.exists(self.filename) and ".backup" not in self.filename:
|
||||||
filename = os.path.join(fdir, "_PAMHYR_", "__old__", fname)
|
filename = os.path.join(fdir, "_PAMHYR_", "__old__", fname)
|
||||||
logger.debug(f"Backup previous version copy: {filename}")
|
logger.debug(f"Backup previous version copy: {filename}")
|
||||||
shutil.copy(self.filename, filename)
|
shutil.copy(self.filename, filename)
|
||||||
self._old_save_id += 1
|
self._old_save_id += 1
|
||||||
else:
|
is_new = True
|
||||||
self._init_db_file(self.filename, is_new=True)
|
|
||||||
|
|
||||||
|
self._init_db_file(self.filename, is_new=is_new)
|
||||||
self.commit()
|
self.commit()
|
||||||
|
|
||||||
# Save
|
# Save
|
||||||
|
|
|
||||||
|
|
@ -131,13 +131,15 @@ class CommandLineSolver(AbstractSolver):
|
||||||
if qlog is not None:
|
if qlog is not None:
|
||||||
qlog.put("Export additional files")
|
qlog.put("Export additional files")
|
||||||
|
|
||||||
files = study.river.additional_files.files
|
add_files = study.river.additional_files.files
|
||||||
for add_file in files:
|
for add_file in add_files:
|
||||||
self.export_additional_file(
|
self.export_additional_file(
|
||||||
add_file, repertory, files
|
study, add_file, repertory, files
|
||||||
)
|
)
|
||||||
|
|
||||||
def export_additional_file(self, add_file, repertory, files):
|
return files
|
||||||
|
|
||||||
|
def export_additional_file(self, study, add_file, repertory, files):
|
||||||
if add_file.path == "" or not add_file.is_enabled():
|
if add_file.path == "" or not add_file.is_enabled():
|
||||||
return files
|
return files
|
||||||
|
|
||||||
|
|
@ -158,6 +160,17 @@ class CommandLineSolver(AbstractSolver):
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
|
def export_study_description(self, study, repertory, qlog, name="0"):
|
||||||
|
files = []
|
||||||
|
|
||||||
|
path = os.path.join(
|
||||||
|
repertory, "pamhyr-study-description.txt"
|
||||||
|
)
|
||||||
|
|
||||||
|
with open(path, "w+") as f:
|
||||||
|
txt = study.description
|
||||||
|
f.write(txt)
|
||||||
|
|
||||||
#######
|
#######
|
||||||
# Run #
|
# Run #
|
||||||
#######
|
#######
|
||||||
|
|
|
||||||
|
|
@ -672,6 +672,7 @@ class Mage(CommandLineSolver):
|
||||||
|
|
||||||
self._export_ST(study, repertory, qlog, name=name)
|
self._export_ST(study, repertory, qlog, name=name)
|
||||||
self.export_additional_files(study, repertory, qlog, name=name)
|
self.export_additional_files(study, repertory, qlog, name=name)
|
||||||
|
self.export_study_description(study, repertory, qlog, name=name)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
@ -891,6 +892,7 @@ class Mage8(Mage):
|
||||||
study, repertory, qlog, name=name
|
study, repertory, qlog, name=name
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self.export_study_description(study, repertory, qlog, name=name)
|
||||||
self._export_REP(study, repertory, files, qlog, name=name)
|
self._export_REP(study, repertory, files, qlog, name=name)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue