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

Rev1510, Fix site save without loaded SiteManager

Browse source
This commit is contained in:
shortcutme 2016-09-06 14:52:55 +02:00
parent d9bbb20743
commit a6c4a77e13
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Site/SiteManager.py
View file

@ -23,10 +23,10 @@ class SiteManager(object):
atexit.register(self.save)
# Load all sites from data/sites.json
def load(self):
def load(self, cleanup=True):
self.log.debug("Loading sites...")
from Site import Site
if not self.sites:
if self.sites is None:
self.sites = {}
address_found = []
added = 0
@ -40,16 +40,17 @@ class SiteManager(object):
address_found.append(address)
# Remove deleted adresses
for address in self.sites.keys():
if address not in address_found:
del(self.sites[address])
self.log.debug("Removed site: %s" % address)
if cleanup:
for address in self.sites.keys():
if address not in address_found:
del(self.sites[address])
self.log.debug("Removed site: %s" % address)
# Remove orpan sites from contentdb
for row in ContentDb.getContentDb().execute("SELECT * FROM site"):
if row["address"] not in self.sites:
self.log.info("Deleting orphan site from content.db: %s" % row["address"])
ContentDb.getContentDb().deleteSite(row["address"])
# Remove orpan sites from contentdb
for row in ContentDb.getContentDb().execute("SELECT * FROM site"):
if row["address"] not in self.sites:
self.log.info("Deleting orphan site from content.db: %s" % row["address"])
ContentDb.getContentDb().deleteSite(row["address"])
if added:
self.log.debug("SiteManager added %s sites" % added)