{"id":8575,"url":"https://patchwork.libcamera.org/api/1.1/patches/8575/?format=json","web_url":"https://patchwork.libcamera.org/patch/8575/","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-7-laurent.pinchart@ideasonboard.com>","date":"2020-07-03T00:14:18","name":"[libcamera-devel,06/10] utils: raspberrypi: ctt: json_pretty_print: Add character write method","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0a1e1552596c66170e4748e0fa3f2b022e2b7ebd","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/8575/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/8575/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8575/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 2B5A9BE905\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 EA15C60C58;\n\tFri, 3 Jul 2020 02:14:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E431609C7\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 A11A01450;\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=\"ZmAEorVS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593735275;\n\tbh=cKxC+ZjyOzongWJSon59Bi6YEc0GqqQHKdyZmhGtTUQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ZmAEorVSmipXxiCuio/eIxatgU9Tjq5x284aR6DvOlJyE1df/VsM0nwXBlpZutMMD\n\tirxeEL5KQtdcMvEqRpXO0EQMjOmnaYchD7kBbCc8pjM7p/yDvw0hxxm+N705NEJwdX\n\tcE5aDgTkm+6fhTj+4FkslQnzNBFMn35wYFqB/jZg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jul 2020 03:14:18 +0300","Message-Id":"<20200703001422.24324-7-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 06/10] utils: raspberrypi: ctt:\n\tjson_pretty_print: Add character write method","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":"Add a write method to the JSONPrettyPrinter class to output a character.\nThis will be used to handle state updates when outputting individual\ncharacters.\n\nSigned-off-by: Laurent Pinchart \n---\n .../raspberrypi/ctt/ctt_pretty_print_json.py | 25 +++++++++++--------\n 1 file changed, 14 insertions(+), 11 deletions(-)","diff":"diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\nindex dfa99a6d4034..9d450f6d300c 100644\n--- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n+++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n@@ -25,20 +25,23 @@ class JSONPrettyPrinter(object):\n self.fout.write('\\n')\n self.fout.write(' ' * self.state[\"indent\"] * 4)\n \n+ def write(self, c):\n+ self.fout.write(c)\n+\n def process_char(self, c):\n if c == '{':\n if not self.state[\"skipnewline\"]:\n self.newline()\n- self.fout.write(c)\n+ self.write(c)\n self.state[\"indent\"] += 1\n self.newline()\n elif c == '}':\n self.state[\"indent\"] -= 1\n self.newline()\n- self.fout.write(c)\n+ self.write(c)\n elif c == '[':\n self.newline()\n- self.fout.write(c)\n+ self.write(c)\n self.state[\"indent\"] += 1\n self.newline()\n self.state[\"inarray\"] = [True] + self.state[\"inarray\"]\n@@ -48,27 +51,27 @@ class JSONPrettyPrinter(object):\n self.newline()\n self.state[\"inarray\"].pop(0)\n self.state[\"arraycount\"].pop(0)\n- self.fout.write(c)\n+ self.write(c)\n elif c == ':':\n- self.fout.write(c)\n- self.fout.write(' ')\n+ self.write(c)\n+ self.write(' ')\n elif c == ',':\n if not self.state[\"inarray\"][0]:\n- self.fout.write(c)\n- self.fout.write(' ')\n+ self.write(c)\n+ self.write(' ')\n self.newline()\n else:\n- self.fout.write(c)\n+ self.write(c)\n self.state[\"arraycount\"][0] += 1\n if self.state[\"arraycount\"][0] == 16:\n self.state[\"arraycount\"][0] = 0\n self.newline()\n else:\n- self.fout.write(' ')\n+ self.write(' ')\n elif c.isspace():\n pass\n else:\n- self.fout.write(c)\n+ self.write(c)\n self.state[\"skipnewline\"] = (c == '[')\n \n def print(self, string):\n","prefixes":["libcamera-devel","06/10"]}