oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move SiteStorage database updating to separate function

Browse source
This commit is contained in:
shortcutme 2017-02-09 01:56:20 +01:00
parent 4ec0209dd7
commit f3c71f3e6c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Site/SiteStorage.py
View file

@ -69,6 +69,10 @@ class SiteStorage(object):
self.openDb() self.openDb()
return self.db 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 # Return possible db files for the site
def getDbFiles(self): def getDbFiles(self):
for content_inner_path, content in self.site.content_manager.contents.iteritems(): for content_inner_path, content in self.site.content_manager.contents.iteritems():
@ -119,7 +123,7 @@ class SiteStorage(object):
try: try:
for file_inner_path, file in self.getDbFiles(): for file_inner_path, file in self.getDbFiles():
try: try:
if self.db.loadJson(file_inner_path, file=file, cur=cur): if self.updateDbFile(file_inner_path, file=file, cur=cur):
found += 1 found += 1
except Exception, err: except Exception, err:
self.log.error("Error importing %s: %s" % (file_inner_path, Debug.formatException(err))) self.log.error("Error importing %s: %s" % (file_inner_path, Debug.formatException(err)))
@ -211,7 +215,6 @@ class SiteStorage(object):
# Site content updated # Site content updated
def onUpdated(self, inner_path, file=None): def onUpdated(self, inner_path, file=None):
file_path = self.getPath(inner_path)
# Update Sql cache # Update Sql cache
if inner_path == "dbschema.json": if inner_path == "dbschema.json":
self.has_db = self.isFile("dbschema.json") self.has_db = self.isFile("dbschema.json")
@ -223,7 +226,7 @@ class SiteStorage(object):
if config.verbose: if config.verbose:
self.log.debug("Loading json file to db: %s" % inner_path) self.log.debug("Loading json file to db: %s" % inner_path)
try: try:
self.getDb().loadJson(file_path, file) self.updateDbFile(inner_path, file)
except Exception, err: except Exception, err:
self.log.error("Json %s load error: %s" % (inner_path, Debug.formatException(err))) self.log.error("Json %s load error: %s" % (inner_path, Debug.formatException(err)))
self.closeDb() self.closeDb()