Add ?format=prettyjson output option, and make sure JSON output has a…

… newline.
Greplin · Sep 20, 2011 · 42da72c · 42da72c
1 parent c691843
commit 42da72c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/greplin/scales/flaskhandler.py b/src/greplin/scales/flaskhandler.py
@@ -41,6 +41,8 @@ def statsHandler(serverName, path=''):
   query = request.args.get('query', None)
   if outputFormat == 'json':
     formats.jsonFormat(output, statDict, query)
+  elif outputFormat == 'prettyjson':
+    formats.jsonFormat(output, statDict, query, pretty=True)
   else:
     formats.htmlHeader(output, '/' + path, serverName, query)
     formats.htmlFormat(output, tuple(parts), statDict, query)

diff --git a/src/greplin/scales/formats.py b/src/greplin/scales/formats.py
@@ -126,9 +126,11 @@ def _htmlRenderDict(pathParts, statDict, output):
   output.write('</table>')
 
 
-def jsonFormat(output, statDict = None, query = None):
+def jsonFormat(output, statDict = None, query = None, pretty = False):
   """Formats as JSON, writing to the given object."""
   statDict = statDict or scales.getStats()
   if query:
     statDict = runQuery(statDict, query)
-  json.dump(statDict, output, cls=scales.StatContainerEncoder)
+  indent = (pretty and 2) or None
+  json.dump(statDict, output, cls=scales.StatContainerEncoder, indent=indent)
+  output.write('\n')
diff --git a/src/greplin/scales/tornadohandler.py b/src/greplin/scales/tornadohandler.py
@@ -51,6 +51,8 @@ def get(self, path): # pylint: disable=W0221
     query = self.get_argument('query', default=None)
     if outputFormat == 'json':
       formats.jsonFormat(self, statDict, query)
+    elif outputFormat == 'prettyjson':
+      formats.jsonFormat(self, statDict, query, pretty=True)
     else:
       formats.htmlHeader(self, '/' + path, self.servername, query)
       formats.htmlFormat(self, tuple(parts), statDict, query)

diff --git a/src/greplin/scales/twistedweb.py b/src/greplin/scales/twistedweb.py
@@ -53,7 +53,9 @@ def render_GET(self, request):
     if 'format' in request.args and request.args['format'][0] == 'json':
       request.headers['content-type'] = 'text/javascript; charset=UTF-8'
       formats.jsonFormat(request, statDict, query)
-
+    elif 'format' in request.args and request.args['format'][0] == 'prettyjson':
+      request.headers['content-type'] = 'text/javascript; charset=UTF-8'
+      formats.jsonFormat(request, statDict, query, pretty=True)
     else:
       formats.htmlHeader(request, '/' + '/'.join(parts), self.serverName, query)
       formats.htmlFormat(request, tuple(parts), statDict, query)