Fix duplicate wildcards

Would occur if the extension folder was also just "wildcards" due to recursive search

javascript/tagAutocomplete.js

@@ -277,7 +277,7 @@ function insertTextAtCursor(textArea, result, tagword) {
     textArea.dispatchEvent(new Event("input", { bubbles: true }));
 
     // Update previous tags with the edited prompt to prevent re-searching the same term
-    let tags = newPrompt.match(/[^, ]+/g);
+    let tags = newPrompt.match(/[^,\n\r ]+/g);
     previousTags = tags;
 
     // Hide results after inserting
@@ -384,7 +384,7 @@ function autocomplete(textArea, prompt, fixedTag = null) {
 
     if (fixedTag === null) {
         // Match tags with RegEx to get the last edited one
-        let tags = prompt.match(/[^, ]+/g);
+        let tags = prompt.match(/[^,\n\r ]+/g);
         let diff = difference(tags, previousTags)
         previousTags = tags;
 
@@ -405,7 +405,7 @@ function autocomplete(textArea, prompt, fixedTag = null) {
         tagword = fixedTag;
     }
 
-    tagword = tagword.toLowerCase();
+    tagword = tagword.toLowerCase().trim();
 
     if (acConfig.useWildcards && [...tagword.matchAll(/\b__([^, ]+)__([^, ]*)\b/g)].length > 0) {
         // Show wildcards from a file with that name
@@ -422,7 +422,7 @@ function autocomplete(textArea, prompt, fixedTag = null) {
             wcPair = wildcardExtFiles.find(x => x[1].toLowerCase() === wcFile);
 
         let wildcards = readFile(`file/${wcPair[0]}/${wcPair[1]}.txt`).split("\n")
-                        .filter(x => x.trim().length > 0); // Remove empty lines
+            .filter(x => x.trim().length > 0); // Remove empty lines
 
         results = wildcards.filter(x => (wcWord !== null && wcWord.length > 0) ? x.toLowerCase().includes(wcWord) : x) // Filter by tagword
             .map(x => [wcFile + ": " + x.trim(), "wildcardTag"]); // Mark as wildcard
@@ -620,7 +620,7 @@ onUiUpdate(function () {
             wildcardFiles = wcFileArr.slice(1)
                 .filter(x => x.trim().length > 0) // Remove empty lines
                 .map(x => [wcBasePath, x.trim().replace(".txt", "")]); // Remove file extension & newlines
-            
+
             // To support multiple sources, we need to separate them using the provided "-----" strings
             let wcExtFileArr = readFile(`file/${tagBasePath}/temp/wce.txt`).split("\n");
             let splitIndices = [];
@@ -640,7 +640,7 @@ onUiUpdate(function () {
                 wcExtFile = wcExtFile.slice(1)
                     .filter(x => x.trim().length > 0) // Remove empty lines
                     .map(x => x.trim().replace(base, "").replace(".txt", "")); // Remove file extension & newlines;
-                
+
                 wcExtFile = wcExtFile.map(x => [base, x]);
                 wildcardExtFiles.push(...wcExtFile);
             }

scripts/tag_autocomplete_helper.py

@@ -11,6 +11,8 @@ FILE_DIR = Path().absolute()
 EXT_PATH = FILE_DIR.joinpath('extensions')
 
 # Tags base path
+
+
 def get_tags_base_path():
     script_path = Path(scripts.basedir())
     if (script_path.is_relative_to(EXT_PATH)):
@@ -18,29 +20,36 @@ def get_tags_base_path():
     else:
         return FILE_DIR.joinpath('tags')
 
+
 TAGS_PATH = get_tags_base_path()
 
 # The path to the folder containing the wildcards and embeddings
 WILDCARD_PATH = FILE_DIR.joinpath('scripts/wildcards')
 EMB_PATH = FILE_DIR.joinpath('embeddings')
 
+
 def find_ext_wildcard_paths():
     """Returns the path to the extension wildcards folder"""
-    found = list(EXT_PATH.rglob('**/wildcards/'))
+    found = list(EXT_PATH.glob('*/wildcards/'))
     return found
 
+
 # The path to the extension wildcards folder
 WILDCARD_EXT_PATHS = find_ext_wildcard_paths()
 
 # The path to the temporary files
-TEMP_PATH = TAGS_PATH.joinpath('temp')
+STATIC_TEMP_PATH = FILE_DIR.joinpath('tmp') # In the webui root, on windows it exists by default, on linux it doesn't
+TEMP_PATH = TAGS_PATH.joinpath('temp') # Extension specific temp files
+
 
 def get_wildcards():
     """Returns a list of all wildcards. Works on nested folders."""
     wildcard_files = list(WILDCARD_PATH.rglob("*.txt"))
-    resolved = [w.relative_to(WILDCARD_PATH).as_posix() for w in wildcard_files if w.name != "put wildcards here.txt"]
+    resolved = [w.relative_to(WILDCARD_PATH).as_posix(
+    ) for w in wildcard_files if w.name != "put wildcards here.txt"]
     return resolved
 
+
 def get_ext_wildcards():
     """Returns a list of all extension wildcards. Works on nested folders."""
     wildcard_files = []
@@ -57,11 +66,13 @@ def get_embeddings():
     """Returns a list of all embeddings"""
     return [str(e.relative_to(EMB_PATH)) for e in EMB_PATH.glob("**/*") if e.suffix in {".bin", ".pt", ".png"}]
 
+
 def write_tag_base_path():
     """Writes the tag base path to a fixed location temporary file"""
-    with open(FILE_DIR.joinpath('tmp/tagAutocompletePath.txt'), 'w', encoding="utf-8") as f:
+    with open(STATIC_TEMP_PATH.joinpath('tagAutocompletePath.txt'), 'w', encoding="utf-8") as f:
         f.write(TAGS_PATH.relative_to(FILE_DIR).as_posix())
 
+
 def write_to_temp_file(name, data):
     """Writes the given data to a temporary file"""
     with open(TEMP_PATH.joinpath(name), 'w', encoding="utf-8") as f:
@@ -70,6 +81,9 @@ def write_to_temp_file(name, data):
 
 # Write the tag base path to a fixed location temporary file
 # to enable the javascript side to find our files regardless of extension folder name
+if not STATIC_TEMP_PATH.exists():
+    STATIC_TEMP_PATH.mkdir(exist_ok=True)
+
 write_tag_base_path()
 
 # Check if the temp path exists and create it if not