oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only use positive sizes to calculate size sum of content.json

Browse source
This commit is contained in:
shortcutme 2017-06-19 15:48:33 +02:00
parent 94c7ce9f42
commit 0224863b1f
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/ContentManager.py
View file

@ -679,7 +679,7 @@ class ContentManager(object):
# Checks if the content.json content is valid # Checks if the content.json content is valid
# Return: True or False # Return: True or False
def verifyContent(self, inner_path, content): def verifyContent(self, inner_path, content):
content_size = len(json.dumps(content, indent=1)) + sum([file["size"] for file in content["files"].values()]) # Size of new content content_size = len(json.dumps(content, indent=1)) + sum([file["size"] for file in content["files"].values() if file["size"] >= 0]) # Size of new content
# Calculate old content size # Calculate old content size
old_content = self.contents.get(inner_path) old_content = self.contents.get(inner_path)
if old_content: if old_content:
@ -689,7 +689,7 @@ class ContentManager(object):
old_content_size = 0 old_content_size = 0
old_content_size_optional = 0 old_content_size_optional = 0
content_size_optional = sum([file["size"] for file in content.get("files_optional", {}).values()]) content_size_optional = sum([file["size"] for file in content.get("files_optional", {}).values() if file["size"] >= 0])
site_size = self.site.settings["size"] - old_content_size + content_size # Site size without old content plus the new site_size = self.site.settings["size"] - old_content_size + content_size # Site size without old content plus the new
site_size_optional = self.site.settings["size_optional"] - old_content_size_optional + content_size_optional # Site size without old content plus the new site_size_optional = self.site.settings["size_optional"] - old_content_size_optional + content_size_optional # Site size without old content plus the new