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

Better site settings saving

Browse source
This commit is contained in:
ZeroNet 2016-08-10 12:34:28 +02:00
parent 1f3a4f0e2f
commit 0d565dc64d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Site/SiteManager.py
View file

@ -67,6 +67,7 @@ class SiteManager(object):
# Return: Site object or None if not found # Return: Site object or None if not found
def get(self, address): def get(self, address):
if self.sites is None: # Not loaded yet if self.sites is None: # Not loaded yet
self.log.debug("Getting new site: %s)..." % address)
self.load() self.load()
return self.sites.get(address) return self.sites.get(address)
@ -87,7 +88,7 @@ class SiteManager(object):
self.sites[address] = site self.sites[address] = site
if not site.settings["serving"]: # Maybe it was deleted before if not site.settings["serving"]: # Maybe it was deleted before
site.settings["serving"] = True site.settings["serving"] = True
site.saveSettings() site.saveSettings()
if all_file: # Also download user files on first sync if all_file: # Also download user files on first sync
site.download(blind_includes=True) site.download(blind_includes=True)
else: else:
@ -100,9 +101,7 @@ class SiteManager(object):
self.log.debug("SiteManager deleted site: %s" % address) self.log.debug("SiteManager deleted site: %s" % address)
del(self.sites[address]) del(self.sites[address])
# Delete from sites.json # Delete from sites.json
sites_settings = json.load(open("%s/sites.json" % config.data_dir)) self.save()
del(sites_settings[address])
helper.atomicWrite("%s/sites.json" % config.data_dir, json.dumps(sites_settings, indent=2, sort_keys=True))
# Lazy load sites # Lazy load sites
def list(self): def list(self):