From 29817dfd24ca5b2536eb14aaadd84d3cbded7a32 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Wed, 2 Jul 2025 20:58:43 +0200 Subject: Format (ruff) and use /bin/findmnt instead of opening /etc/mtab --- smount.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'smount.py') diff --git a/smount.py b/smount.py index 648c6e9..9a0a312 100755 --- a/smount.py +++ b/smount.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- import json import os @@ -9,27 +8,30 @@ import sys def main(): """Main entry point""" - if (len(sys.argv) != 2): - sys.exit('Invalid parameter. Usage: {0} \n'.format( - sys.argv[0])) + if len(sys.argv) != 2: + sys.exit(f'Invalid parameter. Usage: {sys.argv[0]} \n') + cstm_error = '' + try: cstm_error = 'Could not open config (~/.smount.json)' + with open(os.path.expanduser('~/.smount.json')) as fp: config_dict = json.load(fp) - cstm_error = 'Invalid / nonexistent mapping: {0}'.format(sys.argv[1]) + + cstm_error = f'Invalid / nonexistent mapping: {sys.argv[1]}' data = config_dict[sys.argv[1]] - cstm_error = 'system() error' + cstm_error = 'subprocess error' args = ['/usr/bin/sshfs'] if data.get('options'): for opt in data.get('options'): args.extend(['-o', opt]) args.extend([data['src'], data['dest']]) subprocess.check_call(args) - except subprocess.CalledProcessError as e: - print('Execution error: {0}'.format(e), file=sys.stderr, flush=True) + except subprocess.CalledProcessError as err: + print(f'Execution error: {err}', file=sys.stderr, flush=True) except Exception: - print('Error: {0}'.format(cstm_error), file=sys.stderr, flush=True) + print(f'Error: {cstm_error}', file=sys.stderr, flush=True) if __name__ == '__main__': -- cgit v1.3