pyrecli 0.3.5__tar.gz → 0.3.7__tar.gz

{pyrecli-0.3.5 → pyrecli-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrecli
-Version: 0.3.5
+Version: 0.3.7
 Summary: Command line utilities for DiamondFire templates
 License-Expression: MIT
 License-File: LICENSE
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: dev
-Requires-Dist: dfpyre (>=0.10.6)
+Requires-Dist: dfpyre (>=0.11.0)
 Requires-Dist: pytest (>=9.0.2) ; extra == "dev"
 Requires-Dist: rapidnbt (>=1.3.5)
 Requires-Dist: twine (>=6.2.0) ; extra == "dev"

{pyrecli-0.3.5 → pyrecli-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyrecli"
-version = "0.3.5"
+version = "0.3.7"
 description = "Command line utilities for DiamondFire templates"
 authors = [
     {name = "Amp"}
@@ -11,7 +11,7 @@ keywords = ["diamondfire", "minecraft", "template", "cli", "tools"]
 
 requires-python = ">=3.10"
 dependencies = [
-    "dfpyre>=0.10.6",
+    "dfpyre>=0.11.0",
     "rapidnbt>=1.3.5"
 ]
 

{pyrecli-0.3.5 → pyrecli-0.3.7}/pyrecli/command/rename.py

@@ -5,9 +5,9 @@ from pyrecli.util import read_input_file, write_output_file, parse_templates_fro
 
 
 TEXT_CODE_PATTERNS = [
-    re.compile(r"%var\(([a-zA-Z0-9!@#$%^&*~`\-_=+\\|;':\",.\/<>? ]+)\)"),
-    re.compile(r"%index\(([a-zA-Z0-9!@#$%^&*~`\-_=+\\|;':\",.\/<>? ]+),\d+\)"),
-    re.compile(r"%entry\(([a-zA-Z0-9!@#$%^&*~`\-_=+\\|;':\",.\/<>? ]+),[a-zA-Z0-9!@#$%^&*~`\-_=+\\|;':\",.\/<>? ]+\)")
+    re.compile(r"%var\(([^\t\r\n]+)\)"),
+    re.compile(r"%index\(([^\t\r\n]+),\d+\)"),
+    re.compile(r"%entry\(([^\t\r\n]+),[^\t\r\n]+\)")
 ]
 
 
@@ -33,16 +33,19 @@ def rename_command(input_path: str, output_path: str,
                 if isinstance(argument, Variable):
                     if argument.name == var_to_rename and (var_to_rename_scope is None or argument.scope == var_to_rename_scope):
                         argument.name = new_var_name
+                    
+                    # Check if this var's name contains a text code with the target variable
                     argument.name = rename_var_in_text_code(argument.name, var_to_rename, new_var_name)
                 
                 # Try to rename parameter
-                elif isinstance(argument, Parameter) and var_to_rename_scope == 'line':
-                    if argument.name == var_to_rename:
+                elif isinstance(argument, Parameter):
+                    if argument.name == var_to_rename and var_to_rename_scope == 'line':
                         argument.name = new_var_name
                 
-                # Check for occurrences of the variable in text codes
-                elif isinstance(argument, (Number, String, Text)) and isinstance(argument.value, str):
-                    argument.value = rename_var_in_text_code(argument.value, var_to_rename, new_var_name)
+                # Rename occurrences of the variable in text codes
+                elif isinstance(argument, (Number, String, Text)):
+                    if isinstance(argument.value, str):
+                        argument.value = rename_var_in_text_code(argument.value, var_to_rename, new_var_name)
             
             # Check for text codes in function calls
             if codeblock.type in {'call_func', 'start_process'}: