From 0569697d98b45aeb5210e4dfec1d15855419f32c Mon Sep 17 00:00:00 2001 From: ZeroNet Date: Wed, 10 Aug 2016 12:31:54 +0200 Subject: [PATCH] Update database on delete --- src/Site/SiteStorage.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index c0980b0a..50e9a453 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -374,17 +374,6 @@ class SiteStorage(object): # Delete site's all file def deleteFiles(self): - if self.has_db: - self.log.debug("Deleting db file...") - self.closeDb() - try: - schema = self.loadJson("dbschema.json") - db_path = self.getPath(schema["db_file"]) - if os.path.isfile(db_path): - os.unlink(db_path) - except Exception, err: - self.log.error("Db file delete error: %s" % err) - self.log.debug("Deleting files from content.json...") files = [] # Get filenames for content_inner_path, content in self.site.content_manager.contents.iteritems(): @@ -398,10 +387,23 @@ class SiteStorage(object): file_inner_path = helper.getDirname(content_inner_path) + file_relative_path # Relative to site dir files.append(file_inner_path) + if self.isFile("dbschema.json"): + self.log.debug("Deleting db file...") + self.closeDb() + self.has_db = False + try: + schema = self.loadJson("dbschema.json") + db_path = self.getPath(schema["db_file"]) + if os.path.isfile(db_path): + os.unlink(db_path) + except Exception, err: + self.log.error("Db file delete error: %s" % err) + for inner_path in files: path = self.getPath(inner_path) if os.path.isfile(path): os.unlink(path) + self.onUpdated(inner_path, False) self.log.debug("Deleting empty dirs...") for root, dirs, files in os.walk(self.directory, topdown=False):