From 468fe8f266ef337926fef0c207b74a0e5c8b3eab Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 3 Oct 2017 15:30:10 +0200 Subject: [PATCH] Move json formatting to separate function --- src/Site/SiteStorage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index e1caabbc..9bb2da44 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -258,8 +258,7 @@ class SiteStorage(object): with self.open(inner_path) as file: return json.load(file) - # Write formatted json file - def writeJson(self, inner_path, data): + def formatJson(self, data): content = json.dumps(data, indent=1, sort_keys=True) # Make it a little more compact by removing unnecessary white space @@ -282,9 +281,12 @@ class SiteStorage(object): # Remove end of line whitespace content = re.sub("(?m)[ ]+$", "", content) + return content + # Write formatted json file + def writeJson(self, inner_path, data): # Write to disk - self.write(inner_path, content) + self.write(inner_path, self.formatJson(data)) # Get file size def getSize(self, inner_path):