fix:自动修正新加用例

yefansky · yefansky · commit 901ca3832366 · 2025-05-05T04:42:08.000+08:00
diff --git a/src/cvbManager.ts b/src/cvbManager.ts
@@ -265,6 +265,30 @@ export class TCVB {
     // 移除##指令前的空格
     content = content.replace(/^(\s+)##/gm, '##');
 
+    // 处理CREATE操作后多余的NEW_CONTENT指令
+    content = content.replace(
+      /## OPERATION:CREATE\n(?:## NEW_CONTENT\n)?([\s\S]*?)(?=\n## |\n## END_TCVB|$)/gi,
+      (match, codeSection) => {
+          // 检测代码块是否被正确包裹
+          const trimmed = codeSection.trim();
+          const hasStart = trimmed.startsWith('```');
+          const hasEnd = trimmed.endsWith('```');
+
+          let fixedCode = codeSection.trim();
+          
+          // 确保代码块正确包裹
+          if (!hasStart && !hasEnd) {
+              fixedCode = `\`\`\`\n${fixedCode}\n\`\`\``;
+          } else if (hasStart && !hasEnd) {
+              fixedCode = `${codeSection}\n\`\`\``;
+          } else if (!hasStart && hasEnd) {
+              fixedCode = `\`\`\`\n${codeSection}`;
+          }
+
+          return `## OPERATION:CREATE\n${fixedCode}`;
+      }
+    );
+
     // 规则4/10：修复代码块包裹问题（精确处理需要代码块的操作）
     content = content.replace(
       /(## (?:OLD_CONTENT|NEW_CONTENT|OPERATION:CREATE)\n)([\s\S]*?)(?=\n## |\n## END_TCVB|$)/gis,
@@ -274,6 +298,8 @@ export class TCVB {
           const hasStart = trimmed.startsWith('```');
           const hasEnd = trimmed.endsWith('```');
 
+          directive = directive.trim();
+
           // 情况1：完全未包裹的代码块
           if (!hasStart && !hasEnd) {
               return `${directive}\n\`\`\`\n${codeSection.trim()}\n\`\`\``;
@@ -310,7 +336,8 @@ export class TCVB {
   
             if (!hasOldContent && hasNewContent) {
                 const newContentMatch = match.match(/## NEW_CONTENT\n```([\s\S]*?)```/);
-                const newContentCode = newContentMatch ? newContentMatch[1] : '';
+                let newContentCode = newContentMatch ? newContentMatch[1] : '';
+                newContentCode = newContentCode.trim();
                 return `## OPERATION:CREATE\n\`\`\`\n${newContentCode}\n\`\`\``;
             } else if (hasOldContent && !hasNewContent) {
                 return match + '\n## NEW_CONTENT\n```\n```';
diff --git a/src/test/fixapi.test.ts b/src/test/fixapi.test.ts
@@ -32,4 +32,110 @@ suite('MergeCvb Test Suite', () => {
 
     assert.notStrictEqual(processedResult, processedOldCvb);
   });
+});
+
+suite('TCVB AutoFix Test Suite', () => {
+  // 测试用例1：END_TCVB标签缺失 + 代码块未闭合
+  test('Case1: Missing END_TCVB + unclosed code', () => {
+    const input = `
+## BEGIN_TCVB
+## FILE:test.txt
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
+console.log('old')
+## NEW_CONTENT
+console.log('new')`;
+
+    const expected = `
+## BEGIN_TCVB
+## FILE:test.txt
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
+\`\`\`
+console.log('old')
+\`\`\`
+## NEW_CONTENT
+\`\`\`
+console.log('new')
+\`\`\`
+## END_TCVB`.trim();
+
+    assert.strictEqual(TCVB.autoFixTCVBContent(input).trim(), expected);
+  });
+
+  // 测试用例2：GLOBAL-REPLACE缺失OLD_CONTENT
+  test('Case2: Incomplete GLOBAL-REPLACE', () => {
+    const input = `
+## FILE:test.txt
+## OPERATION:GLOBAL-REPLACE
+## NEW_CONTENT
+console.log('new')`;
+
+    const expected = `
+## FILE:test.txt
+## OPERATION:CREATE
+\`\`\`
+console.log('new')
+\`\`\`
+## END_TCVB`.trim();
+
+    assert.strictEqual(TCVB.autoFixTCVBContent(input).trim(), expected);
+  });
+
+  // 测试用例3：混合问题（指令缩进 + 代码块未闭合）
+  test('Case3: Mixed issues', () => {
+    const input = `
+  ## FILE:test.txt
+    ## OPERATION:CREATE
+    ## NEW_CONTENT
+    function test() {`;
+
+    const expected = `
+## FILE:test.txt
+## OPERATION:CREATE
+\`\`\`
+function test() {
+\`\`\`
+## END_TCVB`.trim();
+
+    assert.strictEqual(TCVB.autoFixTCVBContent(input).trim(), expected);
+  });
+
+  // 测试用例4：只有开始标记的代码块
+  test('Case4: Start code block only', () => {
+    const input = `
+## OPERATION:CREATE
+## NEW_CONTENT
+\`\`\`
+console.log('new')`;
+
+    const expected = `
+## OPERATION:CREATE
+\`\`\`
+console.log('new')
+\`\`\`
+## END_TCVB`.trim();
+
+    assert.strictEqual(TCVB.autoFixTCVBContent(input).trim(), expected);
+  });
+
+  // 测试用例5：无效的闭合顺序
+  test('Case5: Wrong close order', () => {
+    const input = `
+## OPERATION:CREATE
+## NEW_CONTENT
+console.log('test')
+\`\`\`
+## FILE:test2.txt`;
+
+    const expected = `
+## OPERATION:CREATE
+\`\`\`
+console.log('test')
+\`\`\`
+## FILE:test2.txt
+## END_TCVB`.trim();
+
+    assert.strictEqual(TCVB.autoFixTCVBContent(input).trim(), expected);
+  });
 });
diff --git a/testdata/testfix_input2.txt b/testdata/testfix_input2.txt
@@ -0,0 +1,162 @@
+����һ��������ԭ�������
+
+1. �������ͣ�ê�������Ĳ�����
+   - ԭ��������ԭê��δ�����㹻�������ĵ���ƥ��ʧ�ܣ�ʵ�ʴ�����demo.loadǰ�ж������
+   - �ļ�·����d:/lab/GPT-SoVITS_yefanFork/tools/subfix_webui.py
+   - ����д����ê��δ����ǰ�����к�����������
+   - ��ȷд����Ӧ����ǰ�����к�������������������
+
+2. �������ͣ�������һ��
+   - ԭ��������ԭ����ʹ��4���ո���������ê����ʹ�ò�һ�µ�����
+   - �ļ�·����d:/lab/GPT-SoVITS_yefanFork/tools/subfix_webui.py
+   - ����д����������ƥ��ʵ�ʴ���
+   - ��ȷд�����ϸ�ʹ��4�ո�����
+
+3. �������ͣ�·����ʽ����
+   - ԭ��������Windows·����б��δת��
+   - �ļ�·���������ļ�·��
+   - ����д����d:\lab\·��
+   - ��ȷд����d:/lab/·�� �� ˫��б��
+
+���ڶ�������С�Ķ�������
+
+1. �ļ�1�޸ģ�
+   - λ�ã�d:/lab/GPT-SoVITS_yefanFork/tools/subfix_webui.py
+   - �޸����ݣ�
+     - ��չê�㷶Χ����ǰ������
+     - �ϸ񱣳�4�ո�����
+     - ȷ��demo.load������������
+
+2. �ļ�2�޸ģ�
+   - λ�ã�d:/lab/GPT-SoVITS_yefanFork/GPT_SoVITS/inference_webui.py
+   - �޸����ݣ�
+     - ��ȷƥ��ԭ��Markdown�ṹ
+     - ����ԭ�в���˳��
+     - ȷ����ť����λ��׼ȷ
+
+�������������������
+
+```python
+## BEGIN_TCVB
+
+## FILE:d:/lab/GPT-SoVITS_yefanFork/tools/subfix_webui.py
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
+        with gr.Row():
+            batchsize_slider = gr.Slider(
+                minimum=1, maximum=g_batch, value=g_batch, step=1, label="Batch Size", scale=3, interactive=False
+            )
+            interval_slider = gr.Slider(minimum=0, maximum=2, value=0, step=0.01, label="Interval", scale=3)
+            btn_theme_dark = gr.Button("Light Theme", link="?__theme=light", scale=1)
+            btn_theme_light = gr.Button("Dark Theme", link="?__theme=dark", scale=1)
+
+        demo.load(
+            b_change_index,
+            inputs=[
+                index_slider,
+                batchsize_slider,
+            ],
+            outputs=[*g_text_list, *g_audio_list, *g_checkbox_list],
+        )
+```
+## NEW_CONTENT
+        with gr.Row():
+            batchsize_slider = gr.Slider(
+                minimum=1, maximum=g_batch, value=g_batch, step=1, label="Batch Size", scale=3, interactive=False
+            )
+            interval_slider = gr.Slider(minimum=0, maximum=2, value=0, step=0.01, label="Interval", scale=3)
+            btn_theme_dark = gr.Button("Light Theme", link="?__theme=light", scale=1)
+            btn_theme_light = gr.Button("Dark Theme", link="?__theme=dark", scale=1)
+            btn_send_to_infer = gr.Button("Send to Inference", variant="primary", scale=1)
+
+        def b_send_to_inference(*checkbox_list):
+            selected_data = []
+            for i, checkbox in enumerate(checkbox_list):
+                if checkbox and g_index + i < len(g_data_json):
+                    selected_data.append({
+                        "audio_path": g_data_json[g_index + i][g_json_key_path],
+                        "text": g_data_json[g_index + i][g_json_key_text].strip()
+                    })
+            if selected_data:
+                try:
+                    with open("shared_audio_ref.txt", "w", encoding="utf-8") as f:
+                        json.dump(selected_data[0], f)
+                    return gr.Info("Sent to inference page successfully!")
+                except Exception as e:
+                    return gr.Warning(f"Failed to send: {str(e)}")
+            return gr.Warning("No audio selected!")
+            
+        btn_send_to_infer.click(
+            b_send_to_inference,
+            inputs=[*g_checkbox_list],
+            outputs=[]
+        )
+
+        demo.load(
+            b_change_index,
+            inputs=[
+                index_slider,
+                batchsize_slider,
+            ],
+            outputs=[*g_text_list, *g_audio_list, *g_checkbox_list],
+        )
+
+## FILE:d:/lab/GPT-SoVITS_yefanFork/GPT_SoVITS/inference_webui.py
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
+                gr.Markdown(
+                    html_left(
+                        i18n("ʹ���޲ο��ı�ģʽʱ����ʹ��΢����GPT")
+                        + "<br>"
+                        + i18n("������ο���Ƶ˵��ɶ(������дɶ)���Կ���������������д�Ĳο��ı���")
+                    )
+                )
+                prompt_text = gr.Textbox(label=i18n("�ο���Ƶ���ı�"), value="", lines=5, max_lines=5, scale=1)
+```
+## NEW_CONTENT
+                gr.Markdown(
+                    html_left(
+                        i18n("ʹ���޲ο��ı�ģʽʱ����ʹ��΢����GPT")
+                        + "<br>"
+                        + i18n("������ο���Ƶ˵��ɶ(������дɶ)���Կ���������������д�Ĳο��ı���")
+                    )
+                )
+                btn_load_ref = gr.Button(i18n("Load from Annotation"), variant="secondary", scale=1)
+                prompt_text = gr.Textbox(label=i18n("�ο���Ƶ���ı�"), value="", lines=5, max_lines=5, scale=1)
+
+        def load_annotation_data():
+            try:
+                if os.path.exists("shared_audio_ref.txt"):
+                    with open("shared_audio_ref.txt", "r", encoding="utf-8") as f:
+                        data = json.load(f)
+                    return data["audio_path"], data["text"], gr.Info("Loaded from annotation!")
+                return None, None, gr.Warning("No shared data found!")
+            except Exception as e:
+                return None, None, gr.Warning(f"Load failed: {str(e)}")
+                
+        btn_load_ref.click(
+            load_annotation_data,
+            outputs=[inp_ref, prompt_text]
+        )
+
+## END_TCVB
+```
+
+�����Ĳ����ܽ�˵����
+
+1. ����������֤��
+   - ê�㷶Χ����չ��������������
+   - �����ϸ�ƥ��ԭ�ļ�(4�ո�)
+   - ·����ʽͳһΪ��б��
+   - ���й��������������
+
+2. �޸�����ȷ�ϣ�
+   - ��עҳ�棺������ť�������߼�
+   - ����ҳ�棺�������ذ�ť�������߼�
+   - �����ļ���������ʵ��
+
+3. �����Ա�֤��
+   - ���ı�ԭ�в������ݷ�ʽ
+   - ���ƻ����й����߼�
+   - ������������ԭ�д���һ��
+
