<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23207">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 "dir" command.<br><br>pysim-shell does not have a convinient way to list the files available<br>in one directory. Tab completion currently is the only way to obtain a<br>list of the available files. Lets add a dir command to print a file<br>list.<br><br>Change-Id: Ic06a60e0a0ec54d9bb26e151453ceb49d69e3df7<br>Related: OS#4963<br>---<br>M pySim-shell.py<br>M pySim/utils.py<br>2 files changed, 52 insertions(+), 1 deletion(-)<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 ce9630a..407204f 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -38,7 +38,7 @@</span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.cards import card_detect, Card</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, h2s</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import dec_st, init_reader, sanitize_pin_adm</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import dec_st, init_reader, sanitize_pin_adm, tabulate_str_list</span><br><span> from pySim.card_handler import card_handler</span><br><span> </span><br><span> from pySim.filesystem import CardMF, RuntimeState</span><br><span>@@ -112,6 +112,35 @@</span><br><span> (data, sw) = self._cmd.card._scc.verify_chv(opts.chv_nr, opts.code)</span><br><span> self._cmd.poutput(data)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dir_parser = argparse.ArgumentParser()</span><br><span style="color: hsl(120, 100%, 40%);">+ dir_parser.add_argument('--fids', help='Show file identifiers', action='store_true')</span><br><span style="color: hsl(120, 100%, 40%);">+ dir_parser.add_argument('--names', help='Show file names', action='store_true')</span><br><span style="color: hsl(120, 100%, 40%);">+ dir_parser.add_argument('--apps', help='Show applications', action='store_true')</span><br><span style="color: hsl(120, 100%, 40%);">+ dir_parser.add_argument('--all', help='Show all selectable identifiers and names', action='store_true')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @cmd2.with_argparser(dir_parser)</span><br><span style="color: hsl(120, 100%, 40%);">+ def do_dir(self, opts):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Show a listing of files available in currently selected DF or MF"""</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.all:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags = []</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.fids or opts.names or opts.apps:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags = ['PARENT', 'SELF']</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.fids:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags += ['FIDS', 'AIDS']</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.names:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags += ['FNAMES', 'ANAMES']</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.apps:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags += ['ANAMES', 'AIDS']</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ flags = ['PARENT', 'SELF', 'FNAMES', 'ANAMES']</span><br><span style="color: hsl(120, 100%, 40%);">+ selectables = list(self._cmd.rs.selected_file.get_selectable_names(flags = flags))</span><br><span style="color: hsl(120, 100%, 40%);">+ directory_str = tabulate_str_list(selectables, width = 79, hspace = 2, lspace = 1, align_left = True)</span><br><span style="color: hsl(120, 100%, 40%);">+ path_list = self._cmd.rs.selected_file.fully_qualified_path(True)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput('/'.join(path_list))</span><br><span style="color: hsl(120, 100%, 40%);">+ path_list = self._cmd.rs.selected_file.fully_qualified_path(False)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput('/'.join(path_list))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput(directory_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput("%d files" % len(selectables))</span><br><span> </span><br><span> </span><br><span> </span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index f452e1d..e1fb4c7 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -794,3 +794,25 @@</span><br><span> else:</span><br><span> sw_masked = sw_masked + sw_lower[i]</span><br><span> return sw_masked == pattern</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def tabulate_str_list(str_list, width = 79, hspace = 2, lspace = 1, align_left = True):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Pretty print a list of strings into a tabulated form"""</span><br><span style="color: hsl(120, 100%, 40%);">+ if str_list == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return ""</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(str_list) <= 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ return ""</span><br><span style="color: hsl(120, 100%, 40%);">+ longest_str = max(str_list, key=len)</span><br><span style="color: hsl(120, 100%, 40%);">+ cellwith = len(longest_str) + hspace</span><br><span style="color: hsl(120, 100%, 40%);">+ cols = width // cellwith</span><br><span style="color: hsl(120, 100%, 40%);">+ rows = (len(str_list) - 1) // cols + 1</span><br><span style="color: hsl(120, 100%, 40%);">+ table = []</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in iter(range(rows)):</span><br><span style="color: hsl(120, 100%, 40%);">+ str_list_row = str_list[i::rows]</span><br><span style="color: hsl(120, 100%, 40%);">+ if (align_left):</span><br><span style="color: hsl(120, 100%, 40%);">+ format_str_cell = '%%-%ds'</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ format_str_cell = '%%%ds'</span><br><span style="color: hsl(120, 100%, 40%);">+ format_str_row = (format_str_cell % cellwith) * len(str_list_row)</span><br><span style="color: hsl(120, 100%, 40%);">+ format_str_row = (" " * lspace) + format_str_row</span><br><span style="color: hsl(120, 100%, 40%);">+ table.append(format_str_row % tuple(str_list_row))</span><br><span style="color: hsl(120, 100%, 40%);">+ return '\n'.join(table)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23207">change 23207</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/+/23207"/><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: Ic06a60e0a0ec54d9bb26e151453ceb49d69e3df7 </div>
<div style="display:none"> Gerrit-Change-Number: 23207 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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-CC: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>