NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

utils: raspberrypi: ctt: json_pretty_print: Avoid spaces at end of lines

Browse source 
Avoid outputting spaces at end of lines by recording the need for a
space and outputting it before the next character only if not a newline.

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:
Laurent Pinchart 2020-07-03 01:43:57 +03:00
parent bfad33c3ef
commit f128acc325
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utils/raspberrypi/ctt/ctt_pretty_print_json.py
View file

@ -18,6 +18,7 @@ class JSONPrettyPrinter(object):
"arraycount": [], "arraycount": [],
"skipnewline": True, "skipnewline": True,
"need_indent": False, "need_indent": False,
"need_space": False,
} }
self.fout = fout self.fout = fout
@ -26,12 +27,16 @@ class JSONPrettyPrinter(object):
if not self.state["skipnewline"]: if not self.state["skipnewline"]:
self.fout.write('\n') self.fout.write('\n')
self.state["need_indent"] = True self.state["need_indent"] = True
self.state["need_space"] = False
self.state["skipnewline"] = True self.state["skipnewline"] = True
def write(self, c): def write(self, c):
if self.state["need_indent"]: if self.state["need_indent"]:
self.fout.write(' ' * self.state["indent"] * 4) self.fout.write(' ' * self.state["indent"] * 4)
self.state["need_indent"] = False self.state["need_indent"] = False
if self.state["need_space"]:
self.fout.write(' ')
self.state["need_space"] = False
self.fout.write(c) self.fout.write(c)
self.state["skipnewline"] = False self.state["skipnewline"] = False
@ -60,11 +65,10 @@ class JSONPrettyPrinter(object):
self.write(c) self.write(c)
elif c == ':': elif c == ':':
self.write(c) self.write(c)
self.write(' ') self.state["need_space"] = True
elif c == ',': elif c == ',':
if not self.state["inarray"][0]: if not self.state["inarray"][0]:
self.write(c) self.write(c)
self.write(' ')
self.newline() self.newline()
else: else:
self.write(c) self.write(c)
@ -73,7 +77,7 @@ class JSONPrettyPrinter(object):
self.state["arraycount"][0] = 0 self.state["arraycount"][0] = 0
self.newline() self.newline()
else: else:
self.write(' ') self.state["need_space"] = True
elif c.isspace(): elif c.isspace():
pass pass
else: else: