<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23803">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: separate export summary with a headline<br><br>the export summary is printed after the log entry for the last file<br>without separation. This is confusing because it looks like if the<br>summary would refer to the last file only. Lets add a headline to make<br>clear that the last few lines are the "Export summary"<br><br>Change-Id: I90771e525b2b114bdb41a8e90d298ca991c09c3d<br>Related: OS#4963<br>---<br>M pySim-shell.py<br>M pySim/utils.py<br>2 files changed, 18 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index a8db263..d622128 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> from pySim.transport import init_reader, ApduTracer</span><br><span> from pySim.cards import card_detect, Card</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, h2s, JsonEncoder</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str</span><br><span> from pySim.card_handler import card_handler</span><br><span> </span><br><span> from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF</span><br><span>@@ -237,10 +237,8 @@</span><br><span> df_path_list = df.fully_qualified_path(True)</span><br><span> df_path_list_fid = df.fully_qualified_path(False)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput("#" * 80)</span><br><span style="color: hsl(0, 100%, 40%);">- file_str = '/'.join(df_path_list) + "/" + str(filename) + " " * 80</span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput("# " + file_str[0:77] + "#")</span><br><span style="color: hsl(0, 100%, 40%);">- self._cmd.poutput("#" * 80)</span><br><span style="color: hsl(120, 100%, 40%);">+ file_str = '/'.join(df_path_list) + "/" + str(filename)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput(boxed_heading_str(file_str))</span><br><span> </span><br><span> self._cmd.poutput("# directory: %s (%s)" % ('/'.join(df_path_list), '/'.join(df_path_list_fid)))</span><br><span> try:</span><br><span>@@ -288,6 +286,9 @@</span><br><span> self.export(opts.filename, context)</span><br><span> else:</span><br><span> self.walk(0, self.export, context)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput(boxed_heading_str("Export summary"))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self._cmd.poutput("# total files visited: %u" % context['COUNT'])</span><br><span> self._cmd.poutput("# bad files: %u" % context['ERR'])</span><br><span> for b in context['BAD']:</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index a0da03a..2da93a5 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -841,3 +841,15 @@</span><br><span> if isinstance(o, BytesIO) or isinstance(o, bytes) or isinstance(o, bytearray):</span><br><span> return b2h(o)</span><br><span> return json.JSONEncoder.default(self, o)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def boxed_heading_str(heading, width=80):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Generate a string that contains a boxed heading."""</span><br><span style="color: hsl(120, 100%, 40%);">+ # Auto-enlarge box if heading exceeds length</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(heading) > width - 4:</span><br><span style="color: hsl(120, 100%, 40%);">+ width = len(heading) + 4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ res = "#" * width</span><br><span style="color: hsl(120, 100%, 40%);">+ fstr = "\n# %-" + str(width - 4) + "s #\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ res += fstr % (heading)</span><br><span style="color: hsl(120, 100%, 40%);">+ res += "#" * width</span><br><span style="color: hsl(120, 100%, 40%);">+ return res</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23803">change 23803</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/+/23803"/><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: I90771e525b2b114bdb41a8e90d298ca991c09c3d </div>
<div style="display:none"> Gerrit-Change-Number: 23803 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>