From 963b83db89e675d10369104a76932ee8b5fb663a Mon Sep 17 00:00:00 2001
From: Jordan Thompson <jordanslost@gmail.com>
Date: Fri, 21 Jul 2023 01:09:30 -0700
Subject: [PATCH] Update WAS_Node_Suite.py

Move nested wildcard replacement to sub-method
---
 WAS_Node_Suite.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/WAS_Node_Suite.py b/WAS_Node_Suite.py
index 9d3c88f..630bc8b 100644
--- a/WAS_Node_Suite.py
+++ b/WAS_Node_Suite.py
@@ -483,6 +483,21 @@ def nsp_parse(text, seed=0, noodle_key='__', nspterminology=None, pantry_path=No
 # Simple wildcard parser:
 
 def replace_wildcards(text, seed=None, noodle_key='__'):
+
+    def replace_nested(text, key_path_dict):
+        if re.findall(f"{noodle_key}(.+?){noodle_key}", text):
+            for key, file_path in key_path_dict.items():
+                with open(file_path, "r", encoding="utf-8") as file:
+                    lines = file.readlines()
+                    if lines:
+                        random_line = None
+                        while not random_line:
+                            line = random.choice(lines).strip()
+                            if not line.startswith('#') and not line.startswith('//'):
+                                random_line = line
+                        text = text.replace(key, random_line)
+        return text
+
     conf = getSuiteConfig()
     wildcard_dir = os.path.join(WAS_SUITE_ROOT, 'wildcards')
     if not os.path.exists(wildcard_dir):
@@ -516,18 +531,9 @@ def replace_wildcards(text, seed=None, noodle_key='__'):
                     if not line.startswith('#') and not line.startswith('//'):
                         random_line = line
                 text = text.replace(key, random_line)
+                
     # Replace sub-wildacrds in result
-    if re.findall(f"{noodle_key}(.+?){noodle_key}", text):
-        for key, file_path in key_path_dict.items():
-            with open(file_path, "r", encoding="utf-8") as file:
-                lines = file.readlines()
-                if lines:
-                    random_line = None
-                    while not random_line:
-                        line = random.choice(lines).strip()
-                        if not line.startswith('#') and not line.startswith('//'):
-                            random_line = line
-                    text = text.replace(key, random_line)
+    text = replace_nested(text, key_path_dict)
 
     return text