From 74048ce53f59d6bf8d0ea167e7c03695df9ff608 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 4 Oct 2017 13:20:39 +0200 Subject: [PATCH] Update site size on startup and file archival --- src/Content/ContentManager.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py index 2d796a24..2e48c459 100644 --- a/src/Content/ContentManager.py +++ b/src/Content/ContentManager.py @@ -40,13 +40,13 @@ class ContentManager(object): if len(self.contents) == 0: self.log.debug("ContentDb not initialized, load files from filesystem") self.loadContent(add_bad_files=False, delete_removed_files=False) - self.site.settings["size"] = self.getTotalSize() + self.site.settings["size"], self.site.settings["size_optional"] = self.getTotalSize() # Load hashfield cache if "hashfield" in self.site.settings.get("cache", {}): self.hashfield.fromstring(self.site.settings["cache"]["hashfield"].decode("base64")) del self.site.settings["cache"]["hashfield"] - elif self.contents.get("content.json") and self.getOptionalSize() > 0: + elif self.contents.get("content.json") and self.site.settings["size_optional"] > 0: self.site.storage.updateBadFiles() # No hashfield cache created yet self.has_optional_files = bool(self.hashfield) @@ -180,7 +180,7 @@ class ContentManager(object): archived_inner_path = content_inner_dir + archived_dirname + "/content.json" if self.contents.get(archived_inner_path, {}).get("modified", 0) < date_archived: self.removeContent(archived_inner_path) - self.site.settings["size"] = self.getTotalSize() + self.site.settings["size"], self.site.settings["size_optional"] = self.getTotalSize() # Load includes if load_includes and "includes" in new_content: @@ -273,18 +273,7 @@ class ContentManager(object): # Get total size of site # Return: 32819 (size of files in kb) def getTotalSize(self, ignore=None): - size = self.contents.db.getTotalSize(self.site, ignore) - if size: - return size - else: - return 0 - - def getOptionalSize(self): - size = self.contents.db.getOptionalSize(self.site) - if size: - return size - else: - return 0 + return self.contents.db.getTotalSize(self.site, ignore) def listModified(self, since): return self.contents.db.listModified(self.site, since)