From 32ca6ac1a796e5331f504c645de9a55f15049971 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 3 Oct 2017 14:40:13 +0200 Subject: [PATCH] Move site cache generation to separate function to allow plugins to extend it --- src/Site/Site.py | 6 ++++++ src/Site/SiteManager.py | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Site/Site.py b/src/Site/Site.py index ea4bdda7..7d18b0f1 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -118,6 +118,12 @@ class Site(object): SiteManager.site_manager.load(False) SiteManager.site_manager.save() + def getSettingsCache(self): + back = {} + back["bad_files"] = self.bad_files + back["hashfield"] = self.content_manager.hashfield.tostring().encode("base64") + return back + # Max site size in MB def getSizeLimit(self): return self.settings.get("size_limit", int(config.size_limit)) diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py index a0cb14a9..9a5ee1e1 100644 --- a/src/Site/SiteManager.py +++ b/src/Site/SiteManager.py @@ -90,9 +90,7 @@ class SiteManager(object): if recalculate_size: site.settings["size"] = site.content_manager.getTotalSize() # Update site size data[address] = site.settings - data[address]["cache"] = {} - data[address]["cache"]["bad_files"] = site.bad_files - data[address]["cache"]["hashfield"] = site.content_manager.hashfield.tostring().encode("base64") + data[address]["cache"] = site.getSettingsCache() time_generate = time.time() - s s = time.time()