From ec40d3fcc3c1b459d6137e00beee4066473e9d66 Mon Sep 17 00:00:00 2001
From: HelloZeroNet <hello@noloop.me>
Date: Fri, 11 Sep 2015 02:25:37 +0200
Subject: [PATCH] Rev393, Remove all record about the site on delete

---
 src/Config.py           | 2 +-
 src/Site/SiteManager.py | 5 +++++
 src/Ui/UiWebsocket.py   | 3 ++-
 src/User/User.py        | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Config.py b/src/Config.py
index e850a8a8..78995212 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -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()
diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py
index 18f9d278..7f26b40c 100644
--- a/src/Site/SiteManager.py
+++ b/src/Site/SiteManager.py
@@ -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):
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 381a17dd..e8cba7c0 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -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})
 
diff --git a/src/User/User.py b/src/User/User.py
index 2514ded8..cd6afa25 100644
--- a/src/User/User.py
+++ b/src/User/User.py
@@ -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):