From e23bb6d4eaec95bede0c7e935abb328ebcca0d96 Mon Sep 17 00:00:00 2001
From: DominikDoom <rehdominik@gmail.com>
Date: Sat, 2 Sep 2023 17:59:27 +0200
Subject: [PATCH] Add support for --wildcards-dir cmd argument Refactor PR #229
 a bit to share code with this

---
 scripts/shared_paths.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/shared_paths.py b/scripts/shared_paths.py
index f2e32cd..31de7d1 100644
--- a/scripts/shared_paths.py
+++ b/scripts/shared_paths.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from modules import scripts, shared
 
 try:
@@ -33,6 +34,7 @@
 except AttributeError:
     LYCO_PATH = None
 
+
 def find_ext_wildcard_paths():
     """Returns the path to the extension wildcards folder"""
     found = list(EXT_PATH.glob("*/wildcards/"))
@@ -42,11 +44,15 @@ def find_ext_wildcard_paths():
     except ImportError:  # likely not in an a1111 context
         opts = None
 
-    wildcard_dir = getattr(opts, "wildcard_dir", None)
-    if wildcard_dir is not None:
-        wildcard_dir = Path(wildcard_dir)
-        if wildcard_dir.exists():
-            found.append(wildcard_dir)
+    # Append custom wildcard paths
+    custom_paths = [
+        getattr(shared.cmd_opts, "wildcards_dir", None),    # Cmd arg from the wildcard extension
+        getattr(opts, "wildcard_dir", None),                # Custom path from sd-dynamic-prompts
+    ]
+    for path in [Path(p) for p in custom_paths if p is not None]:
+        if path.exists():
+            found.append(path)
+
     return found