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

Also delete sites from content.db

Browse source
This commit is contained in:
shortcutme 2016-09-04 17:59:47 +02:00
parent a1f0c20afc
commit f698ec2502
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Site/SiteStorage.py
View file

@ -392,6 +392,7 @@ class SiteStorage(object):
file_inner_path = helper.getDirname(content_inner_path) + file_relative_path # Relative to site dir file_inner_path = helper.getDirname(content_inner_path) + file_relative_path # Relative to site dir
files.append(file_inner_path) files.append(file_inner_path)
if self.isFile("dbschema.json"): if self.isFile("dbschema.json"):
self.log.debug("Deleting db file...") self.log.debug("Deleting db file...")
self.closeDb() self.closeDb()
@ -404,6 +405,9 @@ class SiteStorage(object):
except Exception, err: except Exception, err:
self.log.error("Db file delete error: %s" % err) self.log.error("Db file delete error: %s" % err)
# Delete from content.db
self.site.content_manager.contents.db.deleteSite(self.site.address)
for inner_path in files: for inner_path in files:
path = self.getPath(inner_path) path = self.getPath(inner_path)
if os.path.isfile(path): if os.path.isfile(path):
@ -426,3 +430,4 @@ class SiteStorage(object):
else: else:
self.log.debug("Site data directory deleted: %s..." % self.directory) self.log.debug("Site data directory deleted: %s..." % self.directory)
return True # All clean return True # All clean