From a614545467dc96bf5c863fdb871eeef45445fd6a Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sun, 4 Sep 2016 17:51:55 +0200 Subject: [PATCH] Faster site settings load --- src/Site/Site.py | 5 ++--- src/Site/SiteManager.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Site/Site.py b/src/Site/Site.py index 8d9f3721..af651a96 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -32,7 +32,7 @@ import SiteManager @PluginManager.acceptPlugins class Site(object): - def __init__(self, address, allow_create=True): + def __init__(self, address, allow_create=True, settings=None): self.address = re.sub("[^A-Za-z0-9]", "", address) # Make sure its correct address self.address_short = "%s..%s" % (self.address[:6], self.address[-4:]) # Short address for logging self.log = logging.getLogger("Site:%s" % self.address_short) @@ -50,8 +50,7 @@ class Site(object): self.page_requested = False # Page viewed in browser self.storage = SiteStorage(self, allow_create=allow_create) # Save and load site files - self.loadSettings() # Load settings from sites.json - self.content_manager = ContentManager(self) # Load contents + self.loadSettings(settings) # Load settings from sites.json self.content_manager = ContentManager(self) self.content_manager.loadContents() # Load content.json files self.connection_server = None diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py index 4c3a12e4..5d6e75be 100644 --- a/src/Site/SiteManager.py +++ b/src/Site/SiteManager.py @@ -31,10 +31,10 @@ class SiteManager(object): address_found = [] added = 0 # Load new adresses - for address in json.load(open("%s/sites.json" % config.data_dir)): + for address, settings in json.load(open("%s/sites.json" % config.data_dir)).iteritems(): if address not in self.sites and os.path.isfile("%s/%s/content.json" % (config.data_dir, address)): s = time.time() - self.sites[address] = Site(address) + self.sites[address] = Site(address, settings=settings) self.log.debug("Loaded site %s in %.3fs" % (address, time.time() - s)) added += 1 address_found.append(address)