From 3c5e4e64ca5ce7601886b44ef9e7035f769fae42 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 15 Aug 2016 13:56:04 +0200 Subject: [PATCH] Fix site size calculation --- src/Content/ContentManager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py index bb332d76..f95b82e9 100644 --- a/src/Content/ContentManager.py +++ b/src/Content/ContentManager.py @@ -599,8 +599,6 @@ class ContentManager(object): content_size_optional = sum([file["size"] for file in content.get("files_optional", {}).values()]) site_size = self.site.settings["size"] - old_content_size + content_size # Site size without old content plus the new - if site_size > self.site.settings.get("size", 0): - self.site.settings["size"] = site_size # Save to settings if larger site_size_limit = self.site.getSizeLimit() * 1024 * 1024 @@ -623,6 +621,7 @@ class ContentManager(object): return False if inner_path == "content.json": + self.site.settings["size"] = site_size # Save to settings if larger return True # Root content.json is passed # Load include details @@ -662,6 +661,8 @@ class ContentManager(object): self.log.error("%s: Includes not allowed" % inner_path) return False # Includes not allowed + self.site.settings["size"] = site_size # Save to settings if larger + return True # All good # Verify file validity