diff --git a/src/Model/Study.py b/src/Model/Study.py index 511a4005..f5636241 100644 --- a/src/Model/Study.py +++ b/src/Model/Study.py @@ -126,15 +126,12 @@ class Study(SQLModel): is_new = False 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): filename = os.path.join(fdir, "_PAMHYR_", "__old__", fname) logger.debug(f"Backup previous version copy: {filename}") shutil.copy(self.filename, filename) self._old_save_id += 1 - if ".backup" in self.filename: - is_new = True - if not os.path.exists(self.filename): is_new = True diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index 51a4de10..958c1b26 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -19,6 +19,7 @@ import os import sys import time +import shutil import logging import subprocess from queue import Queue @@ -784,26 +785,16 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): self.conf.set_last_study(file_name) else: file_name = self._study.filename + ".backup" + shutil.copyfile(old, file_name) self._study.filename = file_name try: - # sql_request_count = self._study.sql_save_request_count() - # progress = QProgressDialog( - # "Backup...", None, - # 0, sql_request_count, - # parent=self - # ) - # progress.setWindowModality(Qt.WindowModal) - # progress.setValue(0) - status = f"Backup ({file_name})..." logger.info(status) self.statusbar.showMessage(status, 3000) - self._study.save( - # progress=lambda: progress.setValue(progress.value() + 1) - ) + self._study.save() status += " Done" logger.info(status)