From ffb9bfdf7fcb5a5edb5ea7fc28f8d88885dbfdb5 Mon Sep 17 00:00:00 2001 From: spiritysdx Date: Thu, 4 Jul 2024 22:08:51 +0800 Subject: [PATCH] update --- README.md | 2 ++ README_EN.md | 2 ++ goecs.go | 20 ++++++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b3d406e..d7acf41 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,8 @@ Usage: goecs [options] Enable/Disable speed test (default true) -spnum int Set the number of servers per operator for speed test (default 2) + -upload + Enable/Disable upload the result (default true) -ut Enable/Disable unlock media test (default true) -v Display version information diff --git a/README_EN.md b/README_EN.md index b068ed4..efa86b1 100644 --- a/README_EN.md +++ b/README_EN.md @@ -165,6 +165,8 @@ Usage: goecs [options] Enable/Disable speed test (default true) -spnum int Set the number of servers per operator for speed test (default 2) + -upload + Enable/Disable upload the result (default true) -ut Enable/Disable unlock media test (default true) -v Display version information diff --git a/goecs.go b/goecs.go index 00a5f8b..811f222 100644 --- a/goecs.go +++ b/goecs.go @@ -37,7 +37,7 @@ import ( ) var ( - ecsVersion = "v0.0.48" + ecsVersion = "v0.0.49" menuMode bool onlyChinaTest bool input, choice string @@ -252,10 +252,10 @@ func main() { securityTestStatus = false } var ( - startTime time.Time - wg1, wg2 sync.WaitGroup - basicInfo, securityInfo, emailInfo, mediaInfo string - output, tempOutput string + startTime time.Time + wg1, wg2, wg3 sync.WaitGroup + basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo string + output, tempOutput string ) // 启动一个goroutine来等待信号,内置计时器 go func() { @@ -308,6 +308,13 @@ func main() { disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck) } }, tempOutput, output) + if onlyChinaTest || pingTestStatus { + wg3.Add(1) + go func() { + defer wg3.Done() + ptInfo = pt.PingTest() + }() + } if emailTestStatus { wg2.Add(1) go func() { @@ -365,7 +372,8 @@ func main() { output = utils.PrintAndCapture(func() { if onlyChinaTest || pingTestStatus { utils.PrintCenteredTitle("三网ICMP的PING值检测", width) - pt.PingTest() + wg3.Wait() + fmt.Println(ptInfo) } }, tempOutput, output) }