ckparser 0.3.4__tar.gz → 0.3.6__tar.gz

{ckparser-0.3.4/ckparser.egg-info → ckparser-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ckparser
-Version: 0.3.4
+Version: 0.3.6
 Summary: Parse Paradox Jomini data files to Python/JSON and revert them back experimentally.
 Author: Marc Debureaux (debnet)
 License-Expression: MIT

{ckparser-0.3.4 → ckparser-0.3.6/ckparser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ckparser
-Version: 0.3.4
+Version: 0.3.6
 Summary: Parse Paradox Jomini data files to Python/JSON and revert them back experimentally.
 Author: Marc Debureaux (debnet)
 License-Expression: MIT

{ckparser-0.3.4 → ckparser-0.3.6}/ckparser.py

@@ -41,7 +41,7 @@ import re
 import time
 
 # Script version
-__version__ = "0.3.4"
+__version__ = "0.3.6"
 
 # Logger (because logging is awesome)
 logger = logging.getLogger(__name__)
@@ -116,7 +116,7 @@ regex_inline = re.compile(r"([^\s\"]+\s*[?!<=>]+\s*(([^@\"]\[?[^\s]+\]?)|(\"[^\"
 # Regex to parse blocks with bracket below the key/operator
 regex_block = re.compile(r"(\s*([?!<=>]+)\s+\{)|(\s+\s*([?!<=>])+\s*\{)", re.MULTILINE)
 # Regex to parse lines with format key=value
-regex_line = re.compile(r"\"?(?P<key>[^\s\"]+)\"?\s*(?P<operator>[?!<=>]+)\s*(list\s*)?(?P<value>.*)")
+regex_line = re.compile(r"\"?(?P<key>[^\s\"?!<=>]+)\"?\s*(?P<operator>[?!<=>]+)\s*(list\s*)?(?P<value>.*)")
 # Regex to parse independent items in a list
 regex_item = re.compile(r"(\"[^\"]+\"|[\d\.]+|[^\s]+)")
 # Regex to parse dates
@@ -547,14 +547,14 @@ def parse_file(
     start_time = time.monotonic()
     if base_dir:
         base_dir = os.sep.join(str(base_dir).rstrip(os.sep).split(os.sep)[:-1]) + os.sep
-        base_dir = os.path.dirname(path.replace(base_dir, ""))
+        base_dir = os.path.normpath(os.path.dirname(path.replace(base_dir, "")))
     base_dir = base_dir or "."
     text = read_file(path, encoding)
     if not text or not text.strip():
         return None
     for pattern, replacement in patch or []:
         text = re.sub(pattern, replacement, text)
-    filename = os.path.join(base_dir, os.path.basename(path))
+    filename = os.path.normpath(os.path.join(base_dir, os.path.basename(path)))
     logger.debug(f"Parsing {filename}")
     data = parse_text(
         text,
@@ -594,7 +594,8 @@ def parse_all_files(
     comments=False,
     dates=False,
     as_object=False,
-    variables_first=True,
+    patches=None,
+    variables_first=False,
     _variables_only=False,
 ):
     """
@@ -608,6 +609,7 @@ def parse_all_files(
     :param dates: (default false) Include dates?
     :param as_object: (default false) Return data as an object-like instead of dict
     :param variables_first: Try to parse variables first
+    :param patches: String replacement patterns per file or globally
     :return: Dictionary (key: file, value: parsed data if keep_data=True)
     """
     start_time = time.monotonic()
@@ -624,17 +626,19 @@ def parse_all_files(
                 dates=dates,
                 as_object=as_object,
                 variables_first=False,
+                patches=patches,
                 _variables_only=True,
             )
         )
-    for current_path, _, all_files in os.walk(path):
+    for current_path, _, all_files in os.walk(os.path.normpath(path)):
         is_script_values = current_path.endswith("script_values")
         if (_variables_only and not is_script_values) or (not _variables_only and variables_first and is_script_values):
             continue
         for filename in all_files:
             if not filename.lower().endswith(".txt"):
                 continue
-            filepath = os.path.join(current_path, filename)
+            filepath = os.path.normpath(os.path.join(current_path, filename))
+            normpath = filepath.replace(os.path.normpath(path), "").lstrip(os.sep).replace(os.sep, "/")
             data = parse_file(
                 filepath,
                 output_dir=output_dir,
@@ -645,12 +649,12 @@ def parse_all_files(
                 dates=dates,
                 as_object=as_object,
                 is_global=_variables_only,
+                patch=patches.get(normpath) if isinstance(patches, dict) else patches,
             )
             if isinstance(data, str):
-                errors.append(filepath)
+                errors.append(normpath)
                 continue
-            filepath = filepath.replace(str(path), "").lstrip(os.sep)
-            success[filepath] = data if keep_data else True
+            success[normpath] = data if keep_data else True
     total_time = time.monotonic() - start_time
     logger.info(f"{len(success)} parsed file(s) and {len(errors)} errors in {total_time:0.3f}s!")
     for error in errors:
@@ -679,11 +683,11 @@ def parse_all_locales(path, encoding="utf_8_sig", language="english", save=False
                     key, _, value = match.groups()
                     locales[key] = value
     else:
-        for current_path, _, all_files in os.walk(path):
+        for current_path, _, all_files in os.walk(os.path.normpath(path)):
             for filename in all_files:
                 if not filename.lower().endswith(".yml"):
                     continue
-                filepath = os.path.join(current_path, filename)
+                filepath = os.path.normpath(os.path.join(current_path, filename))
                 with open(filepath, encoding=encoding) as file:
                     while line := file.readline():
                         if line.strip().lower() == f"l_{language}:":
@@ -930,14 +934,14 @@ def revert_file(path, output_dir=None, encoding="utf_8_sig", base_dir=None, save
     base_dir = base_dir or "."
     with open(path, "r", encoding="utf-8") as file:
         data = json.load(file)
-    filename = os.path.join(str(base_dir), os.path.basename(path))
+    filename = os.path.normpath(os.path.join(str(base_dir), os.path.basename(path)))
     logger.debug(f"Reverting {filename}")
     text = revert(data)
     if save:
         filename, _ = os.path.splitext(os.path.basename(path))
-        directory = os.path.join(output_dir or "output", *base_dir.split(os.sep))
+        directory = os.path.normpath(os.path.join(output_dir or "output", *base_dir.split(os.sep)))
         os.makedirs(directory, exist_ok=True)
-        filename = os.path.join(directory, filename + ".txt")
+        filename = os.path.normpath(os.path.join(directory, filename + ".txt"))
         with open(filename, "w", encoding=encoding) as file:
             file.write(text)
     total_time = time.monotonic() - start_time

{ckparser-0.3.4 → ckparser-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ckparser"
-version = "0.3.4"
+version = "0.3.6"
 description = "Parse Paradox Jomini data files to Python/JSON and revert them back experimentally."
 readme = "README.md"
 requires-python = ">=3.9"