fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/42554?usp=email )
Change subject: filesystem: JsonEditor: offer interactive retry on error
......................................................................
filesystem: JsonEditor: offer interactive retry on error
When json.loads() fails (e.g. the user made a syntax mistake), prompt
the user with "Re-open file for editing? [y]es/[n]o:" and loop back to
the editor if they answer 'y' or 'yes'. If the user declines, return
the original unmodified value so no write is attempted; the temp file
is still cleaned up by __exit__() in that case.
Change-Id: I9161b7becea0d8dfd3f5f740fbb253da2f061a1d
Related: OS#6899
---
M pySim/filesystem.py
1 file changed, 13 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/54/42554/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index d62e71a..d8b7df0 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -598,16 +598,24 @@
def __enter__(self) -> object:
"""Write JSON + examples to a temp file, run the editor, return parsed
result.
- The temp file is kept on JSONDecodeError so the user can correct and
- re-open it manually. It is removed by __exit__() on success."""
+ On JSONDecodeError the user is offered the option to re-open the file
+ and fix the mistake interactively. The temp file is removed by
__exit__()
+ on success, or when the user declines to retry."""
self._file = tempfile.NamedTemporaryFile(prefix='pysim',
suffix='.json',
mode='w', delete=False)
json.dump(self._orig_json, self._file, indent=4, cls=JsonEncoder)
self._append_examples_as_comments(self._file)
self._file.close()
- self._cmd.run_editor(self._file.name)
- with open(self._file.name, 'r') as text_file:
- return json.loads(self._strip_comments(text_file.read()))
+ while True:
+ self._cmd.run_editor(self._file.name)
+ try:
+ with open(self._file.name, 'r') as f:
+ return json.loads(self._strip_comments(f.read()))
+ except json.JSONDecodeError as e:
+ self._cmd.perror(f'Invalid JSON: {e}')
+ answer = self._cmd.read_input('Re-open file for editing?
[y]es/[n]o: ')
+ if answer not in ('y', 'yes'):
+ return self._orig_json
def __exit__(self, *args):
os.unlink(self._file.name)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42554?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I9161b7becea0d8dfd3f5f740fbb253da2f061a1d
Gerrit-Change-Number: 42554
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
