{"id":8577,"url":"https://patchwork.libcamera.org/api/patches/8577/?format=json","web_url":"https://patchwork.libcamera.org/patch/8577/","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-9-laurent.pinchart@ideasonboard.com>","date":"2020-07-03T00:14:20","name":"[libcamera-devel,08/10] utils: raspberrypi: ctt: json_pretty_print: Collapse newlines","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2039f791cc398e2cc1fb56a74b5b142629461cda","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/8577/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/8577/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8577/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 EE10AC2E6B\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 B80F560C6A;\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 BFED160CB1\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 55C9AA2D;\n\tFri, 3 Jul 2020 02:14:36 +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=\"EiQX2PE0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593735276;\n\tbh=Q0nEgp51+e1442dz9uoGps0KFX1YFA9EyoPGVUQ41L8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EiQX2PE0z1lXKpEX5UdQ7waj6HwHLMim3Hy++EKTJn+Sj5mOSHVZknqo89Lv9mdVq\n\tnIQOfZxDjo6mbPjYCxl83aVZ+lrmxMOsjuYBRcgozxib0bRhZabu7uNsWhV4rwlxwO\n\tZEj9Lixjy+kjbqlFNKTZSsqQQch+RMzAq592SbbE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jul 2020 03:14:20 +0300","Message-Id":"<20200703001422.24324-9-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 08/10] utils: raspberrypi: ctt:\n\tjson_pretty_print: Collapse newlines","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":"Simplify the newline skipping logic by simply collapsing newlines. If a\nnewline has been output, all subsequent newlines will be skipped until\nthe next non-newline character is output.\n\nSigned-off-by: Laurent Pinchart \n---\n utils/raspberrypi/ctt/ctt_pretty_print_json.py | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)","diff":"diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\nindex f1c61347d8fc..f7fdb65116bc 100644\n--- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n+++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n@@ -23,19 +23,21 @@ class JSONPrettyPrinter(object):\n self.fout = fout\n \n def newline(self):\n- self.fout.write('\\n')\n- self.state[\"need_indent\"] = True\n+ if not self.state[\"skipnewline\"]:\n+ self.fout.write('\\n')\n+ self.state[\"need_indent\"] = True\n+ self.state[\"skipnewline\"] = 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+ self.state[\"skipnewline\"] = False\n \n def process_char(self, c):\n if c == '{':\n- if not self.state[\"skipnewline\"]:\n- self.newline()\n+ self.newline()\n self.write(c)\n self.state[\"indent\"] += 1\n self.newline()\n@@ -76,7 +78,6 @@ class JSONPrettyPrinter(object):\n pass\n else:\n self.write(c)\n- self.state[\"skipnewline\"] = (c == '[')\n \n def print(self, string):\n for c in string:\n","prefixes":["libcamera-devel","08/10"]}