improve: wildcard normalization

- now replace blank to '-'

modules/impact/config.py

@@ -1,7 +1,7 @@
 import configparser
 import os
 
-version_code = [5, 18, 13]
+version_code = [5, 18, 16]
 version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 dependency_version = 22
@@ -32,6 +32,10 @@ def read_config():
         config.read(config_path)
         default_conf = config['default']
 
+        if not os.path.exists(default_conf['custom_wildcards']):
+            print(f"[WARN] ComfyUI-Impact-Pack: custom_wildcards path not found: {default_conf['custom_wildcards']}. Using default path.")
+            default_conf['custom_wildcards'] = os.path.join(my_path, "..", "..", "custom_wildcards")
+
         return {
                     'dependency_version': int(default_conf['dependency_version']),
                     'mmdet_skip': default_conf['mmdet_skip'].lower() == 'true' if 'mmdet_skip' in default_conf else True,

modules/impact/wildcards.py

@@ -29,7 +29,7 @@ def get_wildcard_dict():
 
 
 def wildcard_normalize(x):
-    return x.replace("\\", "/").lower()
+    return x.replace("\\", "/").replace(' ', '-').lower()
 
 
 def read_wildcard(k, v):
@@ -53,23 +53,28 @@ def read_wildcard_dict(wildcard_path):
             if file.endswith('.txt'):
                 file_path = os.path.join(root, file)
                 rel_path = os.path.relpath(file_path, wildcard_path)
-                key = os.path.splitext(rel_path)[0].replace('\\', '/').lower()
+                key = wildcard_normalize(os.path.splitext(rel_path)[0])
 
                 try:
                     with open(file_path, 'r', encoding="ISO-8859-1") as f:
                         lines = f.read().splitlines()
                         wildcard_dict[key] = lines
-                except UnicodeDecodeError:
+                except yaml.reader.ReaderError:
                     with open(file_path, 'r', encoding="UTF-8", errors="ignore") as f:
                         lines = f.read().splitlines()
                         wildcard_dict[key] = lines
             elif file.endswith('.yaml'):
                 file_path = os.path.join(root, file)
-                with open(file_path, 'r') as f:
-                    yaml_data = yaml.load(f, Loader=yaml.FullLoader)
 
-                    for k, v in yaml_data.items():
-                        read_wildcard(k, v)
+                try:
+                    with open(file_path, 'r', encoding="ISO-8859-1") as f:
+                        yaml_data = yaml.load(f, Loader=yaml.FullLoader)
+                except yaml.reader.ReaderError as e:
+                    with open(file_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                        yaml_data = yaml.load(f, Loader=yaml.FullLoader)
+
+                for k, v in yaml_data.items():
+                    read_wildcard(k, v)
 
     return wildcard_dict
 

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-impact-pack"
 description = "This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler."
-version = "5.18.13"
+version = "5.18.16"
 license = "LICENSE"
 dependencies = ["segment-anything", "scikit-image", "piexif", "transformers", "opencv-python-headless", "GitPython", "scipy>=1.11.4"]