From 032cb593880febabf9b4af02f2102767ab7595d6 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 13 Sep 2020 13:16:11 -0400 Subject: [PATCH] Fix resetting the session when first configuring the calibre-db on first boot up --- cps/db.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cps/db.py b/cps/db.py index 88388e44..48d2247d 100644 --- a/cps/db.py +++ b/cps/db.py @@ -423,10 +423,15 @@ class CalibreDB(): def __init__(self): """ Initialize a new CalibreDB session """ - if not self._init: - raise Exception("CalibreDB not initialized") - self.session = self.session_factory() + self.session = None + if self._init: + self.initSession() + self.instances.add(self) + + + def initSession(self): + self.session = self.session_factory() self.update_title_sort(self.config) @classmethod @@ -534,6 +539,9 @@ class CalibreDB(): cls.session_factory = scoped_session(sessionmaker(autocommit=False, autoflush=True, bind=cls.engine)) + for inst in cls.instances: + inst.initSession() + cls._init = True return True