Skip to content

Commit 52dad98

Browse files
committed
Abstracted log.cmd_docs_url_exit()
1 parent e229c8c commit 52dad98

4 files changed

Lines changed: 20 additions & 24 deletions

File tree

remove-json-keys/src/remove_json_keys/lib/log.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ def version(cli):
3333
print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION.lower()}: {cli.version}{colors.nc}')
3434
def warn(msg, *args, **kwargs) : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
3535

36+
def cmd_docs_url_exit(cli, msg='', cmd='help'):
37+
if msg : print(f'\n{colors.br}ERROR: {msg}')
38+
help_cmd(cli) if cmd == 'help' else init_cmd(cli)
39+
docs_url(cli)
40+
sys.exit(1)
41+
3642
def debug(msg, cli=None, *args, **kwargs):
3743
if '--debug' not in sys.argv: return
3844

@@ -63,14 +69,6 @@ def final_summary(msgs, summary_dict):
6369
data(f'{msgs.log_KEYS} {status}: {len(file_set)}')
6470
print(f'{status_color}[\n ' + '\n '.join(file_set) + f'\n]{colors.nc}')
6571

66-
def help_cmd_docs_url_exit(cli, msg=''):
67-
if msg : print(f'\n{colors.br}ERROR: {msg}')
68-
help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
69-
70-
def init_cmd_docs_url_exit(cli, msg=''):
71-
if msg : print(f'\n{colors.br}ERROR: {msg}')
72-
init_cmd(cli) ; docs_url(cli) ; sys.exit(1)
73-
7472
def trunc(msg, end='\n'):
7573
truncated_lines = [
7674
line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]

remove-json-keys/src/remove_json_keys/lib/settings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def load(cli):
5858
if getattr(ctrl, 'subcmd', False) or getattr(ctrl, 'type', None) == 'legacy':
5959
for arg in ctrl.args : exempt_flags.append(arg)
6060
if unknown_args and not all(any(arg.startswith(exempt) for exempt in exempt_flags) for arg in unknown_args):
61-
log.help_cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
61+
log.cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}", cmd='help')
6262
for ctrl_key, ctrl in vars(controls).items(): # process subcmds
6363
if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
6464
setattr(parsed_args, ctrl_key, True)
@@ -74,10 +74,10 @@ def load(cli):
7474
if hasattr(cli.config, key):
7575
setattr(cli.config, key, val)
7676
else:
77-
log.init_cmd_docs_url_exit(cli,
77+
log.cmd_docs_url_exit(cli,
7878
f"{cli.msgs.err_INVALID_KEY} '{key}' {cli.msgs.err_FOUND_IN}"
79-
f'\n{log.colors.gry}{cli.config_filepath}'
80-
)
79+
f'\n{log.colors.gry}{cli.config_filepath}',
80+
cmd='init')
8181
log.debug('Config file loaded!', cli)
8282
else:
8383
log.debug('No config file found.')

translate-messages/src/translate_messages/lib/log.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ def version(cli):
3434
print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION.lower()}: {cli.version}{colors.nc}')
3535
def warn(msg, *args, **kwargs) : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
3636

37+
def cmd_docs_url_exit(cli, msg='', cmd='help'):
38+
if msg : print(f'\n{colors.br}ERROR: {msg}')
39+
help_cmd(cli) if cmd == 'help' else init_cmd(cli)
40+
docs_url(cli)
41+
sys.exit(1)
42+
3743
def debug(msg, cli=None, *args, **kwargs):
3844
if '--debug' not in sys.argv: return
3945

@@ -66,14 +72,6 @@ def final_summary(msgs, summary_dict):
6672
data(f'{msgs.log_LANGUAGES} {status}: {len(lang_set)}')
6773
print(f"{status_color}[ {', '.join(lang_set)} ]{colors.nc}")
6874

69-
def help_cmd_docs_url_exit(cli, msg=''):
70-
if msg : print(f'\n{colors.br}ERROR: {msg}')
71-
help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
72-
73-
def init_cmd_docs_url_exit(cli, msg=''):
74-
if msg : print(f'\n{colors.br}ERROR: {msg}')
75-
init_cmd(cli) ; docs_url(cli) ; sys.exit(1)
76-
7775
def trunc(msg, end='\n'):
7876
truncated_lines = [
7977
line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]

translate-messages/src/translate_messages/lib/settings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def load(cli):
6868
if getattr(ctrl, 'subcmd', False) or getattr(ctrl, 'type', None) == 'legacy':
6969
for arg in ctrl.args : exempt_flags.append(arg)
7070
if unknown_args and not all(any(arg.startswith(exempt) for exempt in exempt_flags) for arg in unknown_args):
71-
log.help_cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
71+
log.cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}", cmd='help')
7272
for ctrl_key, ctrl in vars(controls).items(): # process subcmds
7373
if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
7474
setattr(parsed_args, ctrl_key, True)
@@ -84,10 +84,10 @@ def load(cli):
8484
if hasattr(cli.config, key):
8585
setattr(cli.config, key, val)
8686
else:
87-
log.init_cmd_docs_url_exit(cli,
87+
log.cmd_docs_url_exit(cli,
8888
f"{cli.msgs.err_INVALID_KEY} '{key}' {cli.msgs.err_FOUND_IN}"
89-
f'\n{log.colors.gry}{cli.config_filepath}'
90-
)
89+
f'\n{log.colors.gry}{cli.config_filepath}',
90+
cmd='init')
9191
log.debug('Config file loaded!', cli)
9292
else:
9393
log.debug('No config file found.')

0 commit comments

Comments
 (0)