mirror of https://gitlab.com/pamhyr/pamhyr2
Study: Switch to logging.
parent
0a414f4065
commit
bc78542d2c
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from tools import timer, timestamp
|
from tools import timer, timestamp
|
||||||
|
|
@ -14,6 +15,8 @@ from Model.River import River
|
||||||
|
|
||||||
from Checker.Study import *
|
from Checker.Study import *
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
class Study(SQLModel):
|
class Study(SQLModel):
|
||||||
_sub_classes = [
|
_sub_classes = [
|
||||||
River,
|
River,
|
||||||
|
|
@ -81,7 +84,7 @@ class Study(SQLModel):
|
||||||
shutil.rmtree(old_dir)
|
shutil.rmtree(old_dir)
|
||||||
os.makedirs(old_dir)
|
os.makedirs(old_dir)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(e)
|
logger.error(e)
|
||||||
|
|
||||||
fname = fname + "." + str(self._old_save_id)
|
fname = fname + "." + str(self._old_save_id)
|
||||||
filename = os.path.join(fdir, "__old__", fname)
|
filename = os.path.join(fdir, "__old__", fname)
|
||||||
|
|
@ -187,7 +190,7 @@ class Study(SQLModel):
|
||||||
def _update(self):
|
def _update(self):
|
||||||
version = self.execute(f"SELECT value FROM info WHERE key='version'")
|
version = self.execute(f"SELECT value FROM info WHERE key='version'")
|
||||||
|
|
||||||
print(f"{version[0]} == {self._version}")
|
logger.debug(f"{version[0]} == {self._version}")
|
||||||
if version[0] == self._version:
|
if version[0] == self._version:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
@ -195,7 +198,7 @@ class Study(SQLModel):
|
||||||
self.execute(f"UPDATE info SET value='{self._version}' WHERE key='version'")
|
self.execute(f"UPDATE info SET value='{self._version}' WHERE key='version'")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
print("TODO: update failed")
|
logger.info("TODO: update failed")
|
||||||
raise NotImplementedMethodeError(self, self._update)
|
raise NotImplementedMethodeError(self, self._update)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue