re_param captures quotes with commas properly

and removes unnecessary regex

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 46e12dc6..13d0874d 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -11,9 +11,8 @@ from modules import shared, ui_tempdir, script_callbacks
 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_params = re.compile(r"^(?:" + re_param_code + "){3,}$")

 re_imagesize = re.compile(r"^(\d+)x(\d+)$")

 re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")

 type_of_gr_update = type(gr.update())

@@ -243,7 +242,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     done_with_prompt = False

 

     *lines, lastline = x.strip().split("\n")

-    if not re_params.match(lastline):

+    if not re_param.match(lastline):

         lines.append(lastline)

         lastline = ''

 

@@ -262,6 +261,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     res["Negative prompt"] = negative_prompt

 

     for k, v in re_param.findall(lastline):

+        v = v[1:-1] if v[0] == '"' and v[-1] == '"' else v

         m = re_imagesize.match(v)

         if m is not None:

             res[k+"-1"] = m.group(1)