<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23657">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-shell: Add '--oneline' to read_{binary,record}_decoded<br><br>This allows for single-line output, rather than the default JSON<br>pretty-printing<br><br>Change-Id: I08e0e7b6f0d796626f4d6c3e9a2622c1ee0c210a<br>---<br>M pySim/filesystem.py<br>1 file changed, 16 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/57/23657/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 3eea2f4..73348e1 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -397,10 +397,18 @@</span><br><span>             (data, sw) = self._cmd.rs.read_binary(opts.length, opts.offset)</span><br><span>             self._cmd.poutput(data)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        read_bin_dec_parser = argparse.ArgumentParser()</span><br><span style="color: hsl(120, 100%, 40%);">+        read_bin_dec_parser.add_argument('--oneline', action='store_true',</span><br><span style="color: hsl(120, 100%, 40%);">+                                         help='No JSON pretty-printing, dump as a single line')</span><br><span style="color: hsl(120, 100%, 40%);">+        @cmd2.with_argparser(read_bin_dec_parser)</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%);">-            self._cmd.poutput(json.dumps(data, indent=4))</span><br><span style="color: hsl(120, 100%, 40%);">+            if opts.oneline:</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._cmd.poutput(output)</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>@@ -549,11 +557,17 @@</span><br><span> </span><br><span>         read_rec_dec_parser = argparse.ArgumentParser()</span><br><span>         read_rec_dec_parser.add_argument('record_nr', type=int, help='Number of record to be read')</span><br><span style="color: hsl(120, 100%, 40%);">+        read_rec_dec_parser.add_argument('--oneline', action='store_true',</span><br><span style="color: hsl(120, 100%, 40%);">+                                         help='No JSON pretty-printing, dump as a single line')</span><br><span>         @cmd2.with_argparser(read_rec_dec_parser)</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%);">-            self._cmd.poutput(json.dumps(data, indent=4))</span><br><span style="color: hsl(120, 100%, 40%);">+            if opts.oneline:</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._cmd.poutput(output)</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/+/23657">change 23657</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/+/23657"/><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: I08e0e7b6f0d796626f4d6c3e9a2622c1ee0c210a </div>
<div style="display:none"> Gerrit-Change-Number: 23657 </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-MessageType: newchange </div>