From 1176ddcc85a587af9c67b876bb644696642edf1c Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 8 Nov 2022 18:44:11 +0530
Subject: [PATCH] Fix a bug in drag-and-drop where an empty Negative Prompt
 line would result in the next line getting assigned to negative prompts;
 Simplify the drag-and-drop text file parsing logic to use a single algorithm,
 the files are small enough that we don't need over-optimization and confuse
 new developers

---
 ui/index.html      |  2 +-
 ui/media/js/dnd.js | 29 ++++++++---------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 0fd87539..3ba452e8 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -280,7 +280,7 @@
 <script src="media/js/auto-save.js?v=4"></script>
 <script src="media/js/main.js?v=8"></script>
 <script src="media/js/themes.js?v=3"></script>
-<script src="media/js/dnd.js?v=5"></script>
+<script src="media/js/dnd.js?v=6"></script>
 <script>
 async function init() {
     await initSettings()
diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js
index b9c91f1c..5e926d3b 100644
--- a/ui/media/js/dnd.js
+++ b/ui/media/js/dnd.js
@@ -280,7 +280,6 @@ const TASK_TEXT_MAPPING = {
     use_stable_diffusion_model: 'Stable Diffusion model'
 }
 const afterPromptRe = /^\s*Width\s*:\s*\d+\s*(?:\r\n|\r|\n)+\s*Height\s*:\s*\d+\s*(\r\n|\r|\n)+Seed\s*:\s*\d+\s*$/igm
-const lineEndRe = /(?:\r\n|\r|\n)+/igm
 function parseTaskFromText(str) {
     const taskReqBody = {}
 
@@ -296,27 +295,15 @@ function parseTaskFromText(str) {
     for (const key in TASK_TEXT_MAPPING) {
         const name = TASK_TEXT_MAPPING[key];
         let val = undefined
-        if (str.startsWith(name + ':')) {
-            // Backend format, faster
-            lineEndRe.lastIndex = 0
-            const endMatch = lineEndRe.exec(str)
-            if (endMatch) {
-                val = str.slice(name.length + 1, endMatch.index)
-                str = str.slice(endMatch.index + endMatch[0].length)
-            } else {
-                val = str.slice(name.length + 1)
-                str = ""
-            }
-        } else {
-            // User formatted, use regex to get all cases, but slower.
-            const reName = new RegExp(`${name}\\s*:\\s*(.*)(?:\\r\\n|\\r|\\n)*`, 'igm')
-            const match = reName.exec(str);
-            if (match) {
-                str = str.slice(0, match.index) + str.slice(match.index + match[0].length)
-                val = match[1]
-            }
+
+        const reName = new RegExp(`${name}\\ *:\\ *(.*)(?:\\r\\n|\\r|\\n)*`, 'igm')
+        const match = reName.exec(str);
+        if (match) {
+            console.log(match)
+            str = str.slice(0, match.index) + str.slice(match.index + match[0].length)
+            val = match[1]
         }
-        if (val) {
+        if (val !== undefined) {
             taskReqBody[key] = TASK_MAPPING[key].parse(val.trim())
             console.log(TASK_MAPPING[key].name + ':', taskReqBody[key])
             if (!str) {