Update Nlbench.sh

Nlbench.sh

@@ -175,39 +175,56 @@ response_process_output() {
     echo "$input" | sed -E 's/\x1b\[[0-9;]*[a-zA-Z]//g'
 }
 
-# 去除三网测速板块板块ANSI转义码并截取（多线程）
-speedtest_multi_process_output() {
+# 去除三网测速板块板块ANSI转义码并截取
+process_speedtest_output() {
     local input="$1"
-    # Step 1: 去除 ANSI 转义码
+    local keyword="$2"
+    
+    echo "Debug: Processing for keyword: $keyword" >&2
+    
+    # 去除 ANSI 转义码
     local no_ansi
     no_ansi=$(echo "$input" | sed -E 's/\x1b\[[0-9;]*[a-zA-Z]//g')
-    echo "去除 ANSI 转义码后的输出: $no_ansi" >&2
-
-    # Step 2: 过滤掉包含 "测试进行中" 的行
-    local no_progress=$(echo "$no_ansi" | grep -v "^ *测试进行中")
-    echo "过滤掉包含 '测试进行中' 的行后的输出: $no_progress" >&2
-
-    # Step 3: 截取所需的测试结果
-    local speedtest_multi_process_output_result=$(echo "$no_progress" | awk '/大陆三网\+教育网 IPv4 多线程测速/{f=1} f; /北京时间/{f=0}')
-    echo "$speedtest_multi_process_output_result"
+    
+    echo "Debug: Input after ANSI removal (first 500 chars):" >&2
+    echo "${no_ansi:0:500}" >&2
+    
+    # 计算关键字出现的次数
+    local count
+    count=$(echo "$no_ansi" | grep -Fc "$keyword")
+    
+    echo "Debug: Keyword count: $count" >&2
+    
+    # 提取所需的测试结果并过滤进度条
+    local result
+    result=$(echo "$no_ansi" | awk -v count="$count" -v key="$keyword" '
+        BEGIN { found = 0 }
+        $0 ~ key {
+            print "Debug: Found keyword, remaining count: " count > "/dev/stderr"
+            if (--count == 0) {
+                found = 1
+                print "Debug: Starting to capture output" > "/dev/stderr"
+            }
+        }
+        found && !/测试进行中/ && NF { 
+            print "Debug: Capturing line: " $0 > "/dev/stderr"
+            print 
+        }
+        /------------------------ 多功能 自更新 测速脚本 ------------------------/ && count == 0 {
+            print "Debug: Reached end marker" > "/dev/stderr"
+            exit
+        }
+    ')
+    
+    echo "Debug: Result (first 500 chars):" >&2
+    echo "${result:0:500}" >&2
+    
+    echo "$result"
 }
 
-# 去除三网测速板块板块ANSI转义码并截取（单线程）
-speedtest_single_process_output() {
-    local input="$1"
-    # Step 1: 去除 ANSI 转义码
-    local no_ansi
-    no_ansi=$(echo "$input" | sed -E 's/\x1b\[[0-9;]*[a-zA-Z]//g')
-    echo "去除 ANSI 转义码后的输出: $no_ansi" >&2
-
-    # Step 2: 过滤掉包含 "测试进行中" 的行
-    local no_progress
-    no_progress=$(echo "$no_ansi" | grep -v "^ *测试进行中")
-    echo "过滤掉包含 '测试进行中' 的行后的输出: $no_progress" >&2
-
-    # Step 3: 截取所需的测试结果
-    local speedtest_single_process_output_result=$(echo "$no_progress" | awk '/大陆三网\+教育网 IPv4 单线程测速/{f=1} f; /北京时间/{f=0}')
-    echo "$speedtest_single_process_output_result"
+speedtest_process_output() {
+    echo "Debug: Calling speedtest process" >&2
+    process_speedtest_output "$1" "多功能 自更新 测速脚本"
 }
 
 # 去除回程路由板块板块ANSI转义码并截取