smeb_y/nodeloc_vps_test
1
0
Fork 0
mirror of https://github.com/everett7623/nodeloc_vps_test.git synced 2024-12-27 00:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update nodeloc_vps_autotest_speed.sh

Browse Source
This commit is contained in:
Jensfrank 2024-06-28 22:15:09 +08:00 committed by GitHub
parent 33ba14c1eb
commit c3b2e3610a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nodeloc_vps_autotest_speed.sh
View File

@ -109,6 +109,7 @@ run_and_capture() {
echo "$command_output" echo "$command_output"
} }
# 去除三网测速板块板块ANSI转义码并截取
process_speedtest_output() { process_speedtest_output() {
local input="$1" local input="$1"
local keyword="$2" local keyword="$2"
@ -132,19 +133,18 @@ process_speedtest_output() {
local result local result
result=$(echo "$no_ansi" | awk -v count="$count" -v key="$keyword" ' result=$(echo "$no_ansi" | awk -v count="$count" -v key="$keyword" '
BEGIN { found = 0 } BEGIN { found = 0 }
$0 == key { $0 ~ key {
print "Debug: Found keyword, remaining count: " count > "/dev/stderr" print "Debug: Found keyword, remaining count: " count > "/dev/stderr"
if (--count == 0) { if (--count == 0) {
found = 1 found = 1
print "Debug: Starting to capture output" > "/dev/stderr" print "Debug: Starting to capture output" > "/dev/stderr"
next
} }
} }
found && !/测试进行中/ && NF { found && !/测试进行中/ && NF {
print "Debug: Capturing line: " $0 > "/dev/stderr" print "Debug: Capturing line: " $0 > "/dev/stderr"
print print
} }
/系统时间：/ { /------------------------ 多功能 自更新 测速脚本 ------------------------/ && count == 0 {
print "Debug: Reached end marker" > "/dev/stderr" print "Debug: Reached end marker" > "/dev/stderr"
exit exit
} }
@ -156,14 +156,9 @@ process_speedtest_output() {
echo "$result" echo "$result"
} }
speedtest_multi_process_output() { speedtest_process_output() {
echo "Debug: Calling multi-thread process" >&2 echo "Debug: Calling speedtest process" >&2
process_speedtest_output "$1" "大陆三网+教育网 IPv4 多线程测速" process_speedtest_output "$1" "多功能 自更新 测速脚本"
}
speedtest_single_process_output() {
echo "Debug: Calling single-thread process" >&2
process_speedtest_output "$1" "大陆三网+教育网 IPv4 单线程测速"
} }
# 运行所有测试 # 运行所有测试
@ -185,8 +180,8 @@ run_all_tests() {
format_results() { format_results() {
# 处理三网测速结果 # 处理三网测速结果
local processed_speedtest_multi_result=$(speedtest_multi_process_output "$speedtest_multi_result") local processed_speedtest_multi_result=$(speedtest_process_output "$speedtest_multi_result")
local processed_speedtest_single_result=$(speedtest_single_process_output "$speedtest_single_result") local processed_speedtest_single_result=$(speedtest_process_output "$speedtest_single_result")
result="[tabs] result="[tabs]
[tab=\"多线程测速\"] [tab=\"多线程测速\"]