Update formatInfo.ts (#569)

lobehub · May 17, 2024 · aa1504b · aa1504b
1 parent 9862d69
commit aa1504b
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/modules/ImageInfo/features/formatInfo.ts b/src/modules/ImageInfo/features/formatInfo.ts
@@ -1,10 +1,26 @@
 import { parseFromRawInfo } from '@bluelovers/auto1111-pnginfo';
 
-import { Converter } from '@/scripts/formatPrompt';
+import { splitSmartly } from 'split-smartly2';
 
 const formatPrompt = (prompt: string) => {
-  let newPrompt = prompt.replaceAll('&lt;', '<').replaceAll('&gt;', '>');
-  return Converter.convert(newPrompt);
+  let newPrompt = prompt
+    .replaceAll('&lt;', '<')
+    .replaceAll('&gt;', '>')
+    .replace(/^[\x00\s,，。]+$/gm, '')
+    .replace(/\n{2,}/g, '\n')
+  ;
+
+  const entries = splitSmartly(newPrompt.replace(/\n/g, '<br>'), [',','，','。'], {
+    brackets: true,
+    trimSeparators: true,
+  }) as string[];
+
+  return entries
+    .filter(line => line.length)
+    .join(', ')
+    .replace(/<br>/g, '\n')
+    .replace(/^\s+|\s+$/gm, '')
+    ;
 };
 
 export const formatInfo = (info: string) => {