From f3c71f3e6cc3b044b0e38637c062e13afb5b606a Mon Sep 17 00:00:00 2001 From: shortcutme Date: Thu, 9 Feb 2017 01:56:20 +0100 Subject: [PATCH] Move SiteStorage database updating to separate function --- src/Site/SiteStorage.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index 1c7b6151..24d7310f 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -69,6 +69,10 @@ class SiteStorage(object): self.openDb() return self.db + def updateDbFile(self, inner_path, file=None, cur=None): + path = self.getPath(inner_path) + return self.getDb().updateJson(path, file, cur) + # Return possible db files for the site def getDbFiles(self): for content_inner_path, content in self.site.content_manager.contents.iteritems(): @@ -119,7 +123,7 @@ class SiteStorage(object): try: for file_inner_path, file in self.getDbFiles(): try: - if self.db.loadJson(file_inner_path, file=file, cur=cur): + if self.updateDbFile(file_inner_path, file=file, cur=cur): found += 1 except Exception, err: self.log.error("Error importing %s: %s" % (file_inner_path, Debug.formatException(err))) @@ -211,7 +215,6 @@ class SiteStorage(object): # Site content updated def onUpdated(self, inner_path, file=None): - file_path = self.getPath(inner_path) # Update Sql cache if inner_path == "dbschema.json": self.has_db = self.isFile("dbschema.json") @@ -223,7 +226,7 @@ class SiteStorage(object): if config.verbose: self.log.debug("Loading json file to db: %s" % inner_path) try: - self.getDb().loadJson(file_path, file) + self.updateDbFile(inner_path, file) except Exception, err: self.log.error("Json %s load error: %s" % (inner_path, Debug.formatException(err))) self.closeDb()