{"id":8576,"url":"https://patchwork.libcamera.org/api/1.1/patches/8576/?format=json","web_url":"https://patchwork.libcamera.org/patch/8576/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200703001422.24324-8-laurent.pinchart@ideasonboard.com>","date":"2020-07-03T00:14:19","name":"[libcamera-devel,07/10] utils: raspberrypi: ctt: json_pretty_print: Fix indentation handling","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b9c2d84ea1458fef74ccc52329462c104bdedd8c","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8576/mbox/","series":[{"id":1076,"url":"https://patchwork.libcamera.org/api/1.1/series/1076/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1076","date":"2020-07-03T00:14:12","name":"utils: raspberrypi: ctt: Improve JSON pretty printer","version":1,"mbox":"https://patchwork.libcamera.org/series/1076/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8576/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8576/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8A70AC2E69\n\tfor ;\n\tFri, 3 Jul 2020 00:14:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4FD02609C7;\n\tFri, 3 Jul 2020 02:14:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B9DD60C82\n\tfor ;\n\tFri, 3 Jul 2020 02:14:36 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0106F9CB;\n\tFri, 3 Jul 2020 02:14:35 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"bojpdbHn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593735276;\n\tbh=7hroq+IlpH3NtH5Uj9dOXaPGPeSNlTT7GPsKpXxkETk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=bojpdbHnU9izoaIUIk03rTkmouPrvp1BxZHZNjuOx33ntMaZIYDOt/gq1AtrhQF+B\n\tQLOag33hsn6JQvfQL9pSHgJ2OjWoFiA7rwHqe0WmIBAQAjzzQvyGzneeCuSUuefc13\n\tShRnC2NecrCl/4xLhMZjiWQEKWQWbqoYUvrc954Y=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jul 2020 03:14:19 +0300","Message-Id":"<20200703001422.24324-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200703001422.24324-1-laurent.pinchart@ideasonboard.com>","References":"<20200703001422.24324-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 07/10] utils: raspberrypi: ctt:\n\tjson_pretty_print: Fix indentation handling","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Indentation is handled by outputting spaces right after outputting a\nnewline character. That works in most cases, but would result in the\ninput '{}' being printed as\n\n{\n }\n\ninstead of\n\n{\n}\n\nFix it by outputting the indentation before outputting the next\ncharacter after a newline. The indentation value will be updated by\nthen.\n\nSigned-off-by: Laurent Pinchart \n---\n utils/raspberrypi/ctt/ctt_pretty_print_json.py | 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)","diff":"diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\nindex 9d450f6d300c..f1c61347d8fc 100644\n--- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n+++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n@@ -16,16 +16,20 @@ class JSONPrettyPrinter(object):\n \"indent\": 0,\n \"inarray\": [False],\n \"arraycount\": [],\n- \"skipnewline\": True\n+ \"skipnewline\": True,\n+ \"need_indent\": False,\n }\n \n self.fout = fout\n \n def newline(self):\n self.fout.write('\\n')\n- self.fout.write(' ' * self.state[\"indent\"] * 4)\n+ self.state[\"need_indent\"] = True\n \n def write(self, c):\n+ if self.state[\"need_indent\"]:\n+ self.fout.write(' ' * self.state[\"indent\"] * 4)\n+ self.state[\"need_indent\"] = False\n self.fout.write(c)\n \n def process_char(self, c):\n","prefixes":["libcamera-devel","07/10"]}