From 7b138b0d2d01903ead856ac003ef054adc12ce69 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Tue, 31 May 2022 13:42:56 +0200 Subject: [PATCH] pySim-shell: extend walk() so that we can also have an action of ADF or DF The walk() method that we use to traverse the whole file system tree is currently only able to execute action callbacks on EFs. Lets add a mechanism that allows us to have a second callback that is executed when we hit a DF or ADF. Change-Id: Iabcd78552a14a2d3f8f31273dda7731e1f640cdb --- pySim-shell.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pySim-shell.py b/pySim-shell.py index 95dc7073..0ed4b7c5 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -483,12 +483,18 @@ class PySimCommands(CommandSet): self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) - def walk(self, indent=0, action=None, context=None, **kwargs): + def walk(self, indent=0, action_ef=None, action_df=None, context=None, **kwargs): """Recursively walk through the file system, starting at the currently selected DF""" + + if isinstance(self._cmd.rs.selected_file, CardDF): + if action_df: + action_df(context, opts) + files = self._cmd.rs.selected_file.get_selectables( flags=['FNAMES', 'ANAMES']) for f in files: - if not action: + # special case: When no action is performed, just output a directory + if not action_ef and not action_df: output_str = " " * indent + str(f) + (" " * 250) output_str = output_str[0:25] if isinstance(files[f], CardADF): @@ -515,12 +521,12 @@ class PySimCommands(CommandSet): # If the DF was skipped, we never have entered the directory # below, so we must not move up. if skip_df == False: - self.walk(indent + 1, action, context, **kwargs) + self.walk(indent + 1, action_ef, action_df, context, **kwargs) fcp_dec = self._cmd.rs.select("..", self._cmd) - elif action: + elif action_ef: df_before_action = self._cmd.rs.selected_file - action(f, context, **kwargs) + action_ef(f, context, **kwargs) # When walking through the file system tree the action must not # always restore the currently selected file to the file that # was selected before executing the action() callback. @@ -532,8 +538,8 @@ class PySimCommands(CommandSet): """Display a filesystem-tree with all selectable files""" self.walk() - def export(self, filename, context, as_json): - """ Select and export a single file """ + def export_ef(self, filename, context, as_json): + """ Select and export a single elementary file (EF) """ context['COUNT'] += 1 df = self._cmd.rs.selected_file @@ -643,9 +649,9 @@ class PySimCommands(CommandSet): 'DF_SKIP': 0, 'DF_SKIP_REASON': []} kwargs_export = {'as_json': opts.json} if opts.filename: - self.export(opts.filename, context, **kwargs_export) + self.export_ef(opts.filename, context, **kwargs_export) else: - self.walk(0, self.export, context, **kwargs_export) + self.walk(0, self.export_ef, None, context, **kwargs_export) self._cmd.poutput(boxed_heading_str("Export summary"))