{"id":8572,"url":"https://patchwork.libcamera.org/api/patches/8572/?format=json","web_url":"https://patchwork.libcamera.org/patch/8572/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-4-laurent.pinchart@ideasonboard.com>","date":"2020-07-03T00:14:15","name":"[libcamera-devel,03/10] utils: raspberrypi: ctt: json_pretty_print: Make output file a class member","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"013720b70c6277d036be8a4e5a37836d56bc803b","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8572/mbox/","series":[{"id":1076,"url":"https://patchwork.libcamera.org/api/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/8572/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8572/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 BF5AFC2E69\n\tfor ;\n\tFri, 3 Jul 2020 00:14:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BFDE360CAF;\n\tFri, 3 Jul 2020 02:14:36 +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 0855D609C7\n\tfor ;\n\tFri, 3 Jul 2020 02:14:35 +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 99524213C;\n\tFri, 3 Jul 2020 02:14:34 +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=\"YN5cK8aW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593735274;\n\tbh=Ohj9+zn2nWRqdDDpCrzPbv0tERDEiXU/N8GfcL7ksMY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YN5cK8aWEJAX85igbUlXYqGBsV6AsDzdPGJwkRa2ReeUzIvlyXOFeKOAM13EbQbwY\n\tyNHrZVSW2xqL8DZ4KnN4YT7EjDOu99AsIGTbReF0VBaMIf+Kk+fOjC/9fB+iojEkPf\n\t6VXvz+uDFg2iWKhDwVOo4AuI2ZpeFmyE/2enltWg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jul 2020 03:14:15 +0300","Message-Id":"<20200703001422.24324-4-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 03/10] utils: raspberrypi: ctt:\n\tjson_pretty_print: Make output file a class member","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":"Instead of passing the output file to every method of the printer class,\nmake it a class member.\n\nSigned-off-by: Laurent Pinchart \n---\n .../raspberrypi/ctt/ctt_pretty_print_json.py | 58 ++++++++++---------\n 1 file changed, 30 insertions(+), 28 deletions(-)","diff":"diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\nindex 0e9c56234f5c..703a23fe25db 100644\n--- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n+++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n@@ -11,7 +11,7 @@ class JSONPrettyPrinter(object):\n \"\"\"\n Take a collapsed JSON file and make it more readable\n \"\"\"\n- def __init__(self):\n+ def __init__(self, fout):\n self.state = {\n \"indent\": 0,\n \"inarray\": [False],\n@@ -19,65 +19,67 @@ class JSONPrettyPrinter(object):\n \"skipnewline\": True\n }\n \n- def newline(self, fout):\n- fout.write('\\n')\n- fout.write(' ' * self.state[\"indent\"] * 4)\n+ self.fout = fout\n \n- def process_char(self, c, fout):\n+ def newline(self):\n+ self.fout.write('\\n')\n+ self.fout.write(' ' * self.state[\"indent\"] * 4)\n+\n+ def process_char(self, c):\n if c == '{':\n if not self.state[\"skipnewline\"]:\n- self.newline(fout)\n- fout.write(c)\n+ self.newline()\n+ self.fout.write(c)\n self.state[\"indent\"] += 1\n- self.newline(fout)\n+ self.newline()\n elif c == '}':\n self.state[\"indent\"] -= 1\n- self.newline(fout)\n- fout.write(c)\n+ self.newline()\n+ self.fout.write(c)\n elif c == '[':\n- self.newline(fout)\n- fout.write(c)\n+ self.newline()\n+ self.fout.write(c)\n self.state[\"indent\"] += 1\n- self.newline(fout)\n+ self.newline()\n self.state[\"inarray\"] = [True] + self.state[\"inarray\"]\n self.state[\"arraycount\"] = [0] + self.state[\"arraycount\"]\n elif c == ']':\n self.state[\"indent\"] -= 1\n- self.newline(fout)\n+ self.newline()\n self.state[\"inarray\"].pop(0)\n self.state[\"arraycount\"].pop(0)\n- fout.write(c)\n+ self.fout.write(c)\n elif c == ':':\n- fout.write(c)\n- fout.write(' ')\n+ self.fout.write(c)\n+ self.fout.write(' ')\n elif c == ' ':\n pass\n elif c == ',':\n if not self.state[\"inarray\"][0]:\n- fout.write(c)\n- fout.write(' ')\n- self.newline(fout)\n+ self.fout.write(c)\n+ self.fout.write(' ')\n+ self.newline()\n else:\n- fout.write(c)\n+ self.fout.write(c)\n self.state[\"arraycount\"][0] += 1\n if self.state[\"arraycount\"][0] == 16:\n self.state[\"arraycount\"][0] = 0\n- self.newline(fout)\n+ self.newline()\n else:\n- fout.write(' ')\n+ self.fout.write(' ')\n else:\n- fout.write(c)\n+ self.fout.write(c)\n self.state[\"skipnewline\"] = (c == '[')\n \n- def print(self, string, fout):\n+ def print(self, string):\n for c in string:\n- self.process_char(c, fout)\n+ self.process_char(c)\n \n \n def pretty_print_json(str_in, output_filename):\n with open(output_filename, \"w\") as fout:\n- printer = JSONPrettyPrinter()\n- printer.print(str_in, fout)\n+ printer = JSONPrettyPrinter(fout)\n+ printer.print(str_in)\n \n \n if __name__ == '__main__':\n","prefixes":["libcamera-devel","03/10"]}