Rev393, Remove all record about the site on delete

This commit is contained in:
HelloZeroNet 2015-09-11 02:25:37 +02:00
parent 0de6496f96
commit ec40d3fcc3
4 changed files with 14 additions and 2 deletions

View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv):
self.version = "0.3.2"
self.rev = 390
self.rev = 393
self.argv = argv
self.action = None
self.createParser()

View file

@ -6,6 +6,7 @@ import os
from Plugin import PluginManager
from Config import config
@PluginManager.acceptPlugins
class SiteManager(object):
@ -69,6 +70,10 @@ class SiteManager(object):
def delete(self, address):
logging.debug("SiteManager deleted site: %s" % address)
del(self.sites[address])
# Delete from sites.json
sites_settings = json.load(open("%s/sites.json" % config.data_dir))
del(sites_settings[address])
open("%s/sites.json" % config.data_dir, "w").write(json.dumps(sites_settings, indent=2, sort_keys=True))
# Lazy load sites
def list(self):

View file

@ -516,8 +516,9 @@ class UiWebsocket(object):
site.worker_manager.running = False
site.worker_manager.stopWorkers()
site.storage.deleteFiles()
SiteManager.site_manager.delete(address)
site.updateWebsocket()
SiteManager.site_manager.delete(address)
self.user.deleteSiteData(address)
else:
self.response(to, {"error": "Unknown site: %s" % address})

View file

@ -58,6 +58,12 @@ class User(object):
self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s))
return self.sites[address]
def deleteSiteData(self, address):
if address in self.sites:
del(self.sites[address])
self.save()
self.log.debug("Deleted site: %s" % address)
# Get data for a new, unique site
# Return: [site_address, bip32_index, {"auth_address": "xxx", "auth_privatekey": "xxx", "privatekey": "xxx"}]
def getNewSiteData(self):