Created cli.json_path to not mutate cli.config.json_dir

Author: adamlui

remove-json-keys/src/remove_json_keys/__main__.py

@@ -10,15 +10,15 @@ def main():
     if not cli.config.no_wizard : wizard.run(cli)
 
     log.info(f'{cli.msgs.log_SEARCHING_FOR} {cli.config.json_dir}...')
-    init.json_dir(cli)
-    if Path(cli.config.json_dir).exists():
+    init.json_path(cli)
+    if Path(cli.json_path).exists():
         log.success(f'{cli.msgs.log_DIR_FOUND}!')
-        print(f'\n>> {cli.config.json_dir}')
+        print(f'\n>> {cli.json_path}')
     else:
         log.warn(f'{cli.msgs.warn_DIR_NOT_FOUND}.')
         sys.exit(1)
 
-    keys_removed, keys_skipped, files_processed_cnt = data.json.remove_keys(cli.config.json_dir, cli.config.keys)
+    keys_removed, keys_skipped, files_processed_cnt = data.json.remove_keys(cli.json_path, cli.config.keys)
 
     log.final_summary(cli.msgs, {
         'removed': [f'{key} ({file_path})' for key, file_path in keys_removed],

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

@@ -9,16 +9,15 @@ def read(file_path, encoding='utf-8'):
     with open(file_path, 'r', encoding=encoding) as file:
         return json5.load(file)
 
-def remove_keys(json_dir, keys):
+def remove_keys(json_path, keys):
     keys_removed, keys_skipped, files_processed_cnt = [], [], 0
-    json_dir = Path(json_dir)
-    for file_path in json_dir.rglob('*.json'):
+    for file_path in json_path.rglob('*.json'):
         json_data = file.read(file_path)
         modified = False
         for key in keys: # remove matched ones
             re_key = fr'"{re.escape(key)}"\s*:\s*(?:\{{[^}}]*\}}|"[^"]*"|\d+|true|false|null)\s*,?\s*'
             json_data, cnt = re.subn(re_key, '', json_data)
-            rel_path = str(file_path.relative_to(json_dir))
+            rel_path = str(file_path.relative_to(json_path))
             if cnt > 0:
                 keys_removed.append((key, rel_path))
                 modified = True

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

@@ -58,9 +58,9 @@ def config_filepath(cli): # for settings.load()
                 cli.config_filepath = possible_config_file
                 return
 
-def json_dir(cli):
+def json_path(cli):
     for path in Path.cwd().rglob(cli.config.json_dir):
         if path.is_dir():
-            cli.config.json_dir = str(path)
+            cli.json_path = Path(path)
             return
-    cli.config.json_dir = None
+    cli.json_path = None