From d9617a499a174cdf7f56acafc2e7eec24be478c2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 3 Jul 2020 01:43:57 +0300 Subject: utils: raspberrypi: ctt: json_pretty_print: Fix indentation handling Indentation is handled by outputting spaces right after outputting a newline character. That works in most cases, but would result in the input '{}' being printed as { } instead of { } Fix it by outputting the indentation before outputting the next character after a newline. The indentation value will be updated by then. Signed-off-by: Laurent Pinchart Reviewed-by: David Plowman Tested-by: David Plowman --- utils/raspberrypi/ctt/ctt_pretty_print_json.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py index 9d450f6d..f1c61347 100644 --- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py +++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py @@ -16,16 +16,20 @@ class JSONPrettyPrinter(object): "indent": 0, "inarray": [False], "arraycount": [], - "skipnewline": True + "skipnewline": True, + "need_indent": False, } self.fout = fout def newline(self): self.fout.write('\n') - self.fout.write(' ' * self.state["indent"] * 4) + self.state["need_indent"] = True def write(self, c): + if self.state["need_indent"]: + self.fout.write(' ' * self.state["indent"] * 4) + self.state["need_indent"] = False self.fout.write(c) def process_char(self, c): -- cgit v1.2.1