Added exit/log cmd/docs on invalid config file key + msg arg to log.help_cmd_docs_url_exit()

Author: adamlui

remove-json-keys/src/remove_json_keys/assets/data/messages.json

@@ -15,6 +15,7 @@
   "log_ALL_JSON_PROCESSED": { "message": "All JSON files processed" },
   "log_TOTAL_JSON_PROCESSED": { "message": "Total JSON files processed" },
   "log_TYPE": { "message": "Type" },
+  "log_TO_CREATE_DEFAULT_CONFIG": { "message": "to create default config file" },
   "log_FOR_AVAIL_OPTIONS": { "message": "for available options" },
   "tip_FOR_MORE_HELP_VISIT": { "message": "For more help, visit" },
   "tip_PASS_FORCE_TO_OVERWRITE": { "message": "Pass --force to overwrite" },

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

@@ -23,8 +23,8 @@ def dim(msg, *args, **kwargs) : print(f'\n{colors.gry}{msg.format(*args, **kwarg
 def docs_url(cli) : tip(f'{cli.msgs.tip_FOR_MORE_HELP_VISIT}:\n{cli.urls.docs}')
 def error(msg, *args, **kwargs) : print(f'\n{colors.br}ERROR: {msg.format(*args, **kwargs)}{colors.nc}')
 def help_cmd(cli) : info(f"{cli.msgs.log_TYPE} '{cli.cli_cmds[0]} --help' {cli.msgs.log_FOR_AVAIL_OPTIONS}\n")
-def help_cmd_docs_url_exit(cli) : help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
 def info(msg, *args, end='', **kwargs) : print(f'\n{colors.by}{msg.format(*args, **kwargs)}{colors.nc}', end=end)
+def init_cmd(cli) : info(f"{cli.msgs.log_TYPE} '{cli.cli_cmds[0]} --init' {cli.msgs.log_TO_CREATE_DEFAULT_CONFIG}\n")
 def overwrite_print(msg, *args, **kwargs):
     sys.stdout.write('\r' + msg.format(*args, **kwargs).ljust(terminal_width)[:terminal_width])
 def success(msg, *args, **kwargs) : print(f'\n{colors.bg}{msg.format(*args, **kwargs)}{colors.nc}')
@@ -60,6 +60,14 @@ def final_summary(msgs, summary_dict):
             data(f'{msgs.log_KEYS} {status}: {len(file_set)}')
             print(f'{status_color}[\n    ' + '\n    '.join(file_set) + f'\n]{colors.nc}')
 
+def help_cmd_docs_url_exit(cli, msg=''):
+    if msg : print(f'\n{colors.br}ERROR: {msg}')
+    help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
+
+def init_cmd_docs_url_exit(cli, msg=''):
+    if msg: print(f'\n{colors.br}ERROR: {msg}')
+    init_cmd(cli) ; docs_url(cli) ; sys.exit(1)
+
 def trunc(msg, end='\n'):
     truncated_lines = [
         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

@@ -50,8 +50,7 @@ def load(cli):
         if getattr(ctrl, 'subcmd', False):
             for arg in ctrl.args : subcmd_flags.append(arg)
     if unknown_args and not all(f'--{arg}' in subcmd_flags for arg in unknown_args):
-        log.error(f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
-        log.help_cmd_docs_url_exit(cli)
+        log.help_cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
     for ctrl_key, ctrl in vars(controls).items(): # process subcmds
         if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
             setattr(parsed_args, ctrl_key, True)
@@ -63,7 +62,12 @@ def load(cli):
     init.config_filepath(cli)
     if getattr(cli, 'config_filepath', None):
         for key, val in data.json.read(cli.config_filepath).items():
-            if not getattr(cli.config, key): setattr(cli.config, key, val)
+            if not getattr(cli.config, key, None):
+                if hasattr(cli.config, key):
+                    setattr(cli.config, key, val)
+                else:
+                    log.init_cmd_docs_url_exit(cli,
+                        f"Invalid key '{key}' found in \n{log.colors.gry}{cli.config_filepath}")
         log.debug('Config file loaded!', cli)
     else:
         log.debug('No config file found.')

translate-messages/src/translate_messages/assets/data/messages.json

@@ -16,6 +16,7 @@
   "log_NO_NEW_KEYS_ADDED": { "message": "No new keys added (all already present)" },
   "log_ALL_JSON_UPDATED": { "message": "All JSON files updated successfully" },
   "log_TYPE": { "message": "Type" },
+  "log_TO_CREATE_DEFAULT_CONFIG": { "message": "to create default config file" },
   "log_FOR_AVAIL_OPTIONS": { "message": "for available options" },
   "tip_FOR_MORE_HELP_VISIT": { "message": "For more help, visit" },
   "tip_PASS_FORCE_TO_OVERWRITE": { "message": "Pass --force to overwrite" },

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

@@ -23,8 +23,8 @@ def dim(msg, *args, **kwargs) : print(f'\n{colors.gry}{msg.format(*args, **kwarg
 def docs_url(cli) : tip(f'{cli.msgs.tip_FOR_MORE_HELP_VISIT}:\n{cli.urls.docs}')
 def error(msg, *args, **kwargs) : print(f'\n{colors.br}ERROR: {msg.format(*args, **kwargs)}{colors.nc}')
 def help_cmd(cli) : info(f"{cli.msgs.log_TYPE} '{cli.cli_cmds[0]} --help' {cli.msgs.log_FOR_AVAIL_OPTIONS}\n")
-def help_cmd_docs_url_exit(cli) : help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
 def info(msg, *args, end='', **kwargs) : print(f'\n{colors.by}{msg.format(*args, **kwargs)}{colors.nc}', end=end)
+def init_cmd(cli) : info(f"{cli.msgs.log_TYPE} '{cli.cli_cmds[0]} --init' {cli.msgs.log_TO_CREATE_DEFAULT_CONFIG}\n")
 def overwrite_print(msg, *args, **kwargs):
     sys.stdout.write('\r' + msg.format(*args, **kwargs).ljust(terminal_width)[:terminal_width])
 def success(msg, *args, **kwargs) : print(f'\n{colors.bg}{msg.format(*args, **kwargs)}{colors.nc}')
@@ -60,6 +60,14 @@ def final_summary(msgs, summary_dict):
             data(f'{msgs.log_LANGUAGES} {status}: {len(lang_set)}')
             print(f"{status_color}[ {', '.join(lang_set)} ]{colors.nc}")
 
+def help_cmd_docs_url_exit(cli, msg=''):
+    if msg : print(f'\n{colors.br}ERROR: {msg}')
+    help_cmd(cli) ; docs_url(cli) ; sys.exit(1)
+
+def init_cmd_docs_url_exit(cli, msg=''):
+    if msg: print(f'\n{colors.br}ERROR: {msg}')
+    init_cmd(cli) ; docs_url(cli) ; sys.exit(1)
+
 def trunc(msg, end='\n'):
     truncated_lines = [
         line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]

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

@@ -60,8 +60,7 @@ def load(cli):
         if getattr(ctrl, 'subcmd', False):
             for arg in ctrl.args : subcmd_flags.append(arg)
     if unknown_args and not all(f'--{arg}' in subcmd_flags for arg in unknown_args):
-        log.error(f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
-        log.help_cmd_docs_url_exit(cli)
+        log.help_cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}")
     for ctrl_key, ctrl in vars(controls).items(): # process subcmds
         if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
             setattr(parsed_args, ctrl_key, True)
@@ -73,7 +72,12 @@ def load(cli):
     init.config_filepath(cli)
     if getattr(cli, 'config_filepath', None):
         for key, val in data.json.read(cli.config_filepath).items():
-            if not getattr(cli.config, key): setattr(cli.config, key, val)
+            if not getattr(cli.config, key, None):
+                if hasattr(cli.config, key):
+                    setattr(cli.config, key, val)
+                else:
+                    log.init_cmd_docs_url_exit(cli,
+                        f"Invalid key '{key}' found in \n{log.colors.gry}{cli.config_filepath}")
         log.debug('Config file loaded!', cli)
     else:
         log.debug('No config file found.')