From patchwork Fri Jul 3 00:14:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8571 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 62B17BE905 for ; Fri, 3 Jul 2020 00:14:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7B6BE60C57; Fri, 3 Jul 2020 02:14:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LAfuRE/6"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A49C8609C7 for ; Fri, 3 Jul 2020 02:14:34 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 416041450; Fri, 3 Jul 2020 02:14:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1593735274; bh=CO5S+VTGnkOoEXjTW13pkq4J1r6yPzWmL2gw5xuMEag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAfuRE/6xg2C7uND7esb1VD6q6UBpmuU92LLEmW5YgUZ661OpBFXa89JdC+vxW1tH F3M9uP62w4f4Sa2a/0SnvS+Zb4XbvSXpMPcVxa7gEldSwbI/ImZhTTtyUM0SEioAqu KMkEZSg566wVXoF4P0MvyTEPYxbQwA7KthShBB/o= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 3 Jul 2020 03:14:14 +0300 Message-Id: <20200703001422.24324-3-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 02/10] utils: raspberrypi: ctt: json_pretty_print: Turn printer into a class X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Instead of passing a state dictionary to every method, turn the printer into a class and store the state internally. Signed-off-by: Laurent Pinchart --- .../raspberrypi/ctt/ctt_pretty_print_json.py | 117 ++++++++++-------- 1 file changed, 62 insertions(+), 55 deletions(-) diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py index 18938c828b4e..0e9c56234f5c 100644 --- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py +++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py @@ -7,70 +7,77 @@ import sys -""" -takes a collapsed json file and makes it more readable -""" -def process_file(string, fout, state): - for c in string: - process_char(c, fout, state) +class JSONPrettyPrinter(object): + """ + Take a collapsed JSON file and make it more readable + """ + def __init__(self): + self.state = { + "indent": 0, + "inarray": [False], + "arraycount": [], + "skipnewline": True + } + def newline(self, fout): + fout.write('\n') + fout.write(' ' * self.state["indent"] * 4) -def print_newline(fout, state): - fout.write('\n') - fout.write(' '*state["indent"]*4) - - -def process_char(c, fout, state): - if c == '{': - if not state["skipnewline"]: - print_newline(fout, state) - fout.write(c) - state["indent"] += 1 - print_newline(fout, state) - elif c == '}': - state["indent"] -= 1 - print_newline(fout, state) - fout.write(c) - elif c == '[': - print_newline(fout, state) - fout.write(c) - state["indent"] += 1 - print_newline(fout, state) - state["inarray"] = [True] + state["inarray"] - state["arraycount"] = [0] + state["arraycount"] - elif c == ']': - state["indent"] -= 1 - print_newline(fout, state) - state["inarray"].pop(0) - state["arraycount"].pop(0) - fout.write(c) - elif c == ':': - fout.write(c) - fout.write(' ') - elif c == ' ': - pass - elif c == ',': - if not state["inarray"][0]: + def process_char(self, c, fout): + if c == '{': + if not self.state["skipnewline"]: + self.newline(fout) + fout.write(c) + self.state["indent"] += 1 + self.newline(fout) + elif c == '}': + self.state["indent"] -= 1 + self.newline(fout) + fout.write(c) + elif c == '[': + self.newline(fout) + fout.write(c) + self.state["indent"] += 1 + self.newline(fout) + self.state["inarray"] = [True] + self.state["inarray"] + self.state["arraycount"] = [0] + self.state["arraycount"] + elif c == ']': + self.state["indent"] -= 1 + self.newline(fout) + self.state["inarray"].pop(0) + self.state["arraycount"].pop(0) + fout.write(c) + elif c == ':': fout.write(c) fout.write(' ') - print_newline(fout, state) - else: - fout.write(c) - state["arraycount"][0] += 1 - if state["arraycount"][0] == 16: - state["arraycount"][0] = 0 - print_newline(fout, state) - else: + elif c == ' ': + pass + elif c == ',': + if not self.state["inarray"][0]: + fout.write(c) fout.write(' ') - else: - fout.write(c) - state["skipnewline"] = (c == '[') + self.newline(fout) + else: + fout.write(c) + self.state["arraycount"][0] += 1 + if self.state["arraycount"][0] == 16: + self.state["arraycount"][0] = 0 + self.newline(fout) + else: + fout.write(' ') + else: + fout.write(c) + self.state["skipnewline"] = (c == '[') + + def print(self, string, fout): + for c in string: + self.process_char(c, fout) def pretty_print_json(str_in, output_filename): - state = {"indent": 0, "inarray": [False], "arraycount": [], "skipnewline": True} with open(output_filename, "w") as fout: - process_file(str_in, fout, state) + printer = JSONPrettyPrinter() + printer.print(str_in, fout) if __name__ == '__main__':