Added/used data.file.<read|write>()

Author: adamlui

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

@@ -1,5 +1,6 @@
 from . import csv
+from . import file
 from . import json
 from . import sns
 
-__all__ = ['csv', 'json', 'sns']
+__all__ = ['csv', 'file', 'json', 'sns']

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

@@ -0,0 +1,6 @@
+def read(file_path):
+    with open(file_path, 'r', encoding='utf-8') as file : file_content = file.read()
+    return file_content
+
+def write(file_path, file_content):
+    with open(file_path, 'w', encoding='utf-8') as file : file.write(file_content)

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

@@ -1,33 +1,31 @@
 import json, os, re
+from . import file
 
-def read(path):
-    if not os.path.exists(path) : return {}
-    with open(path, 'r', encoding='utf-8') as file : return json.load(file)
+def read(json_path):
+    if not os.path.exists(json_path) : return {}
+    with open(json_path, 'r', encoding='utf-8') as file : return json.load(file)
 
 def remove_keys(cli):
     keys_removed, keys_skipped, files_processed_cnt = [], [], 0
     for root, _, files in os.walk(cli.config.json_dir):
         for filename in files:
             if filename.endswith('.json'):
-
-                # Open found JSON file
                 file_path = os.path.join(root, filename)
-                with open(file_path, 'r', encoding='utf-8') as f : data = f.read()
+                json_data = file.read(file_path)
 
                 # Remove keys
                 modified = False
                 for key in cli.config.keys:
                     re_key = fr'"{re.escape(key)}"\s*:\s*(?:\{{[^}}]*\}}|"[^"]*"|\d+|true|false|null)\s*,?\s*'
-                    data, cnt = re.subn(re_key, '', data)
+                    json_data, cnt = re.subn(re_key, '', json_data)
                     if cnt > 0:
                         keys_removed.append((key, os.path.relpath(file_path, cli.config.json_dir)))
                         modified = True
                     else:
                         keys_skipped.append((key, os.path.relpath(file_path, cli.config.json_dir)))
 
                 # Save modified JSON
-                if modified:
-                    with open(file_path, 'w', encoding='utf-8') as f : f.write(data)
+                if modified : file.write(file_path, json_data)
 
                 files_processed_cnt += 1
 

remove-json-keys/utils/bump.py

@@ -4,7 +4,7 @@
 import tomli, tomli_w
 
 sys.path.insert(0, path.join(path.dirname(__file__), '../src'))
-from remove_json_keys.lib import log # type: ignore
+from remove_json_keys.lib import data, log # type: ignore
 
 msgs = sns(
     pkg_DESC='Bump versions in pyproject.toml + README.md',
@@ -58,9 +58,8 @@ def bump_pyproject_vers(pyproject_path, pyproject, project, new_ver): # project.
 def update_readme_vers(new_ver): # in URLs
     log.info(f'{msgs.log_UPDATING_VERS_IN} README.md...')
     readme_path = path.join(path.dirname(__file__), '../README.md')
-    with open(readme_path, 'r', encoding='utf-8') as file : readme_content = file.read()
-    updated_readme_content = re.sub(r'\b(?>\d{1,3}\.\d{1,3}\.\d{1,3})\b', new_ver, readme_content)
-    with open(readme_path, 'w', encoding='utf-8') as file : file.write(updated_readme_content)
+    updated_readme_content = re.sub(r'\b(?>\d{1,3}\.\d{1,3}\.\d{1,3})\b', new_ver, data.file.read(readme_path))
+    data.file.write(readme_path, updated_readme_content)
     log.success(msgs.log_UPDATED_README_VERS.format(new_ver=new_ver))
 
 def main():

translate-messages/src/translate_messages/lib/data/__init__.py

@@ -1,5 +1,6 @@
 from . import csv
+from . import file
 from . import json
 from . import sns
 
-__all__ = ['csv', 'json', 'sns']
+__all__ = ['csv', 'file', 'json', 'sns']

translate-messages/src/translate_messages/lib/data/file.py

@@ -0,0 +1,6 @@
+def read(file_path):
+    with open(file_path, 'r', encoding='utf-8') as file : file_content = file.read()
+    return file_content
+
+def write(file_path, file_content):
+    with open(file_path, 'w', encoding='utf-8') as file : file.write(file_content)

translate-messages/utils/bump.py

@@ -4,7 +4,7 @@
 import tomli, tomli_w
 
 sys.path.insert(0, path.join(path.dirname(__file__), '../src'))
-from translate_messages.lib import log # type: ignore
+from translate_messages.lib import data, log # type: ignore
 
 msgs = sns(
     pkg_DESC='Bump versions in pyproject.toml + README.md',
@@ -58,9 +58,8 @@ def bump_pyproject_vers(pyproject_path, pyproject, project, new_ver): # project.
 def update_readme_vers(new_ver): # in URLs
     log.info(f'{msgs.log_UPDATING_VERS_IN} README.md...')
     readme_path = path.join(path.dirname(__file__), '../README.md')
-    with open(readme_path, 'r', encoding='utf-8') as file : readme_content = file.read()
-    updated_readme_content = re.sub(r'\b(?>\d{1,3}\.\d{1,3}\.\d{1,3})\b', new_ver, readme_content)
-    with open(readme_path, 'w', encoding='utf-8') as file : file.write(updated_readme_content)
+    updated_readme_content = re.sub(r'\b(?>\d{1,3}\.\d{1,3}\.\d{1,3})\b', new_ver, data.file.read(readme_path))
+    data.file.write(readme_path, updated_readme_content)
     log.success(msgs.log_UPDATED_README_VERS.format(new_ver=new_ver))
 
 def main():