Rev1277, Fix sidebar site size display

spinhead · Apr 27, 2016 · 3294f62 · 3294f62
1 parent 432aa03
commit 3294f62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/plugins/Sidebar/SidebarPlugin.py b/plugins/Sidebar/SidebarPlugin.py
@@ -126,14 +126,18 @@ def sidebarRenderFileStats(self, body, site):
         # Collect stats
         size_filetypes = {}
         size_total = 0
-        for content in site.content_manager.contents.values():
+        for key, content in site.content_manager.contents.iteritems():
             if "files" not in content:
                 continue
             for file_name, file_details in content["files"].items():
                 size_total += file_details["size"]
                 ext = file_name.split(".")[-1]
                 size_filetypes[ext] = size_filetypes.get(ext, 0) + file_details["size"]
-        size_other = size_total
+
+        # The missing difference is content.json sizes
+        if "json" in size_filetypes:
+            size_filetypes["json"] += site.settings["size"] - size_total
+        size_total = size_other = site.settings["size"]
 
         # Bar
         for extension, color in extensions:

diff --git a/src/Config.py b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.3.7"
-        self.rev = 1276
+        self.rev = 1277
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"