<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23659">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-shell: Add settable parameter on JSON pretty-printing<br><br>Change-Id: Ic095c96733de2b0f359bfe067cd719d38712faff<br>---<br>M docs/shell.rst<br>M pySim-shell.py<br>M pySim/filesystem.py<br>3 files changed, 21 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/docs/shell.rst b/docs/shell.rst</span><br><span>index 314f633..ddb21d5 100644</span><br><span>--- a/docs/shell.rst</span><br><span>+++ b/docs/shell.rst</span><br><span>@@ -208,6 +208,14 @@</span><br><span> </span><br><span> If disabled, pySim will always write irrespective of the current/new value.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+json_pretty_print</span><br><span style="color: hsl(120, 100%, 40%);">+~~~~~~~~~~~~~~~~~</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+This parameter determines if generated JSON output should (by default) be pretty-printed (multi-line</span><br><span style="color: hsl(120, 100%, 40%);">+output with indent level of 4 spaces) or not.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+The default value of this parameter is 'true'.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> debug</span><br><span> ~~~~~</span><br><span> </span><br><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index e73ec35..7f48d58 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -72,6 +72,16 @@</span><br><span> self.add_settable(cmd2.Settable('conserve_write', bool, 'Read and compare before write',</span><br><span> onchange_cb=self._onchange_conserve_write))</span><br><span> self.update_prompt()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.json_pretty_print = True</span><br><span style="color: hsl(120, 100%, 40%);">+ self.add_settable(cmd2.Settable('json_pretty_print', bool, 'Pretty-Print JSON output'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def poutput_json(self, data, force_no_pretty = False):</span><br><span style="color: hsl(120, 100%, 40%);">+ """line cmd2.putput() but for a json serializable dict."""</span><br><span style="color: hsl(120, 100%, 40%);">+ if force_no_pretty or self.json_pretty_print == False:</span><br><span style="color: hsl(120, 100%, 40%);">+ output = json.dumps(data)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ output = json.dumps(data, indent=4)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.poutput(output)</span><br><span> </span><br><span> def _onchange_numeric_path(self, param_name, old, new):</span><br><span> self.update_prompt()</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 73348e1..ab9b2f3 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -404,11 +404,7 @@</span><br><span> def do_read_binary_decoded(self, opts):</span><br><span> """Read + decode data from a transparent EF"""</span><br><span> (data, sw) = self._cmd.rs.read_binary_dec()</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.oneline:</span><br><span style="color: hsl(0, 100%, 40%);">- output = json.dumps(data)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- output = json.dumps(data, indent=4)</span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput(output)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput_json(data, opts.oneline)</span><br><span> </span><br><span> upd_bin_parser = argparse.ArgumentParser()</span><br><span> upd_bin_parser.add_argument('--offset', type=int, default=0, help='Byte offset for start of read')</span><br><span>@@ -428,7 +424,7 @@</span><br><span> data_json = json.loads(opts.data)</span><br><span> (data, sw) = self._cmd.rs.update_binary_dec(data_json)</span><br><span> if data:</span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput(json.dumps(data, indent=4))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput_json(data)</span><br><span> </span><br><span> def __init__(self, fid:str, sfid:str=None, name:str=None, desc:str=None, parent:CardDF=None,</span><br><span> size={1,None}):</span><br><span>@@ -563,11 +559,7 @@</span><br><span> def do_read_record_decoded(self, opts):</span><br><span> """Read + decode a record from a record-oriented EF"""</span><br><span> (data, sw) = self._cmd.rs.read_record_dec(opts.record_nr)</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.oneline:</span><br><span style="color: hsl(0, 100%, 40%);">- output = json.dumps(data)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- output = json.dumps(data, indent=4)</span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput(output)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput_json(data, opts.oneline)</span><br><span> </span><br><span> upd_rec_parser = argparse.ArgumentParser()</span><br><span> upd_rec_parser.add_argument('record_nr', type=int, help='Number of record to be read')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23659">change 23659</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23659"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic095c96733de2b0f359bfe067cd719d38712faff </div>
<div style="display:none"> Gerrit-Change-Number: 23659 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>