mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Window: Fix save for windows version.
This commit is contained in:
1 parent
d09665163f
commit
fb06055b11
2 files changed
+21
-6
No files matched your search
+12
-6
@@ -4,6 +4,8 @@ import os
|
||||
import shutil
|
||||
from datetime import datetime
|
||||
|
||||
from tools import timer, timestamp
|
||||
|
||||
from Model.DB import SQLModel
|
||||
from Model.Saved import SavedStatus
|
||||
from Model.Serializable import Serializable
|
||||
@@ -69,11 +71,15 @@ class Study(SQLModel):
|
||||
fdir, fname = os.path.split(self.filename)
|
||||
|
||||
if self._old_save_id == 0:
|
||||
old_dir = os.path.join(fdir, "__old__")
|
||||
if os.name == "nt":
|
||||
old_dir = old_dir.replace("/", "\\")
|
||||
|
||||
try:
|
||||
os.makedirs(os.path.join(fdir, "__old__"))
|
||||
os.makedirs(old_dir)
|
||||
except FileExistsError as e:
|
||||
shutil.rmtree(os.path.join(fdir, "__old__"))
|
||||
os.makedirs(os.path.join(fdir, "__old__"))
|
||||
shutil.rmtree(old_dir)
|
||||
os.makedirs(old_dir)
|
||||
except Exception as e:
|
||||
print(e)
|
||||
|
||||
@@ -227,9 +233,9 @@ class Study(SQLModel):
|
||||
self.execute(f"UPDATE info SET value='{self._sql_format(self.name)}' WHERE key='name'")
|
||||
self.execute(f"UPDATE info SET value='{self._sql_format(self.description)}' WHERE key='description'")
|
||||
self.execute(f"UPDATE info SET value='{self._time_system}' WHERE key='time_system'")
|
||||
self.execute(f"UPDATE info SET value='{self._date.timestamp()}' WHERE key='date'")
|
||||
self.execute(f"UPDATE info SET value='{self.creation_date.timestamp()}' WHERE key='creation_date'")
|
||||
self.execute(f"UPDATE info SET value='{self.last_save_date.timestamp()}' WHERE key='last_save_date'")
|
||||
self.execute(f"UPDATE info SET value='{timestamp(self._date)}' WHERE key='date'")
|
||||
self.execute(f"UPDATE info SET value='{timestamp(self.creation_date)}' WHERE key='creation_date'")
|
||||
self.execute(f"UPDATE info SET value='{timestamp(self.last_save_date)}' WHERE key='last_save_date'")
|
||||
|
||||
self._save_submodel([self._river])
|
||||
self.commit()
|
||||
Reference in new issue
Block a user