utils: raspberrypi: ctt: json_pretty_print: Add character write method
Add a write method to the JSONPrettyPrinter class to output a character. This will be used to handle state updates when outputting individual characters. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Tested-by: David Plowman <david.plowman@raspberrypi.com>
This commit is contained in:
parent
e101c78e03
commit
606741deb9
1 changed files with 14 additions and 11 deletions
|
@ -25,20 +25,23 @@ class JSONPrettyPrinter(object):
|
||||||
self.fout.write('\n')
|
self.fout.write('\n')
|
||||||
self.fout.write(' ' * self.state["indent"] * 4)
|
self.fout.write(' ' * self.state["indent"] * 4)
|
||||||
|
|
||||||
|
def write(self, c):
|
||||||
|
self.fout.write(c)
|
||||||
|
|
||||||
def process_char(self, c):
|
def process_char(self, c):
|
||||||
if c == '{':
|
if c == '{':
|
||||||
if not self.state["skipnewline"]:
|
if not self.state["skipnewline"]:
|
||||||
self.newline()
|
self.newline()
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.state["indent"] += 1
|
self.state["indent"] += 1
|
||||||
self.newline()
|
self.newline()
|
||||||
elif c == '}':
|
elif c == '}':
|
||||||
self.state["indent"] -= 1
|
self.state["indent"] -= 1
|
||||||
self.newline()
|
self.newline()
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
elif c == '[':
|
elif c == '[':
|
||||||
self.newline()
|
self.newline()
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.state["indent"] += 1
|
self.state["indent"] += 1
|
||||||
self.newline()
|
self.newline()
|
||||||
self.state["inarray"] = [True] + self.state["inarray"]
|
self.state["inarray"] = [True] + self.state["inarray"]
|
||||||
|
@ -48,27 +51,27 @@ class JSONPrettyPrinter(object):
|
||||||
self.newline()
|
self.newline()
|
||||||
self.state["inarray"].pop(0)
|
self.state["inarray"].pop(0)
|
||||||
self.state["arraycount"].pop(0)
|
self.state["arraycount"].pop(0)
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
elif c == ':':
|
elif c == ':':
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.fout.write(' ')
|
self.write(' ')
|
||||||
elif c == ',':
|
elif c == ',':
|
||||||
if not self.state["inarray"][0]:
|
if not self.state["inarray"][0]:
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.fout.write(' ')
|
self.write(' ')
|
||||||
self.newline()
|
self.newline()
|
||||||
else:
|
else:
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.state["arraycount"][0] += 1
|
self.state["arraycount"][0] += 1
|
||||||
if self.state["arraycount"][0] == 16:
|
if self.state["arraycount"][0] == 16:
|
||||||
self.state["arraycount"][0] = 0
|
self.state["arraycount"][0] = 0
|
||||||
self.newline()
|
self.newline()
|
||||||
else:
|
else:
|
||||||
self.fout.write(' ')
|
self.write(' ')
|
||||||
elif c.isspace():
|
elif c.isspace():
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
self.fout.write(c)
|
self.write(c)
|
||||||
self.state["skipnewline"] = (c == '[')
|
self.state["skipnewline"] = (c == '[')
|
||||||
|
|
||||||
def print(self, string):
|
def print(self, string):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue