uses autos new regex, checks len of re_param

georgi · Jan 28, 2023 · 591b68e · 591b68e
1 parent 4d634dc
commit 591b68e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
@@ -11,7 +11,7 @@
 import tempfile
 from PIL import Image
 
-re_param_code = r'\s*([\w ]+):\s*(\"[^\"]*\"|[^,]+)'
+re_param_code = r'\s*([\w ]+):\s*("(?:\\"[^,]|\\"|\\|[^\"])+"|[^,]*)(?:,|$)'
 re_param = re.compile(re_param_code)
 re_imagesize = re.compile(r"^(\d+)x(\d+)$")
 re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")
@@ -242,7 +242,7 @@ def parse_generation_parameters(x: str):
     done_with_prompt = False
 
     *lines, lastline = x.strip().split("\n")
-    if not re_param.match(lastline):
+    if len(re_param.findall(lastline)) < 3:
         lines.append(lastline)
         lastline = ''