update

oneclickvirt · Jul 16, 2024 · 2213e52 · 2213e52
1 parent 0f5b11c
commit 2213e52
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/disktest/disktest.go b/disktest/disktest.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-func DiskTest(language, testMethod, testPath string, isMultiCheck bool) {
+func DiskTest(language, testMethod, testPath string, isMultiCheck bool, autoChange bool) {
 	var res string
 	if runtime.GOOS == "windows" {
 		if testMethod != "winsat" && testMethod != "" {
@@ -18,13 +18,13 @@ func DiskTest(language, testMethod, testPath string, isMultiCheck bool) {
 		switch testMethod {
 		case "fio":
 			res = disk.FioTest(language, isMultiCheck, testPath)
-			if res == "" {
+			if res == "" && autoChange {
 				res = "Fio test failed, switching to DD for testing.\n"
 				res += disk.DDTest(language, isMultiCheck, testPath)
 			}
 		case "dd":
 			res = disk.DDTest(language, isMultiCheck, testPath)
-			if res == "" {
+			if res == "" && autoChange {
 				res = "DD test failed, switching to Fio for testing.\n"
 				res += disk.FioTest(language, isMultiCheck, testPath)
 			}

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.4
 require (
 	github.com/imroc/req/v3 v3.43.7
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502
-	github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006
+	github.com/oneclickvirt/UnlockTests v0.0.12-20240716020706
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
 	github.com/oneclickvirt/basics v0.0.6-20240706025619
 	github.com/oneclickvirt/cputest v0.0.8-20240702070215

diff --git a/go.sum b/go.sum
@@ -80,8 +80,8 @@ github.com/nxtrace/NTrace-core v1.3.1 h1:f4z5UaZEuhUP/g6xElpZ2bo+guWITJVrMKrJTqd
 github.com/nxtrace/NTrace-core v1.3.1/go.mod h1:0Px/Zc60qk6cssmP+yv4kstFxvX9sXqDduoVqBO+qf8=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
-github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006 h1:dJyfuPFwmueK7x0TC/PZU1jfgB6s15T9VOwjMn13loY=
-github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
+github.com/oneclickvirt/UnlockTests v0.0.12-20240716020706 h1:vq4XidWGEdPb79aON3KAuCXaEsGhTEaJnedhxGHztAE=
+github.com/oneclickvirt/UnlockTests v0.0.12-20240716020706/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
 github.com/oneclickvirt/basics v0.0.6-20240706025619 h1:IVuyJY41eNAjH9rFf5FPzjegRbkDiS4os9+1YaUov4M=

diff --git a/goecs.go b/goecs.go
@@ -38,7 +38,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.51"
+	ecsVersion                                                        = "v0.0.52"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -55,6 +55,7 @@ var (
 	basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus      bool
 	commTestStatus, utTestStatus, securityTestStatus, emailTestStatus bool
 	backtraceStatus, nt3Status, speedTestStatus, pingTestStatus       bool
+	autoChangeDiskTestMethod                                          = true
 	filePath                                                          = "goecs.txt"
 	enabelUpload                                                      = true
 	help                                                              bool
@@ -120,6 +121,7 @@ func main() {
 		basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus = false, false, false, false
 		commTestStatus, utTestStatus, securityTestStatus, emailTestStatus = false, false, false, false
 		backtraceStatus, nt3Status, speedTestStatus = false, false, false
+		autoChangeDiskTestMethod = true
 		switch language {
 		case "zh":
 			fmt.Println("VPS融合怪版本: ", ecsVersion)
@@ -130,7 +132,7 @@ func main() {
 			fmt.Println("5. 精简解锁版(系统信息+CPU+内存+磁盘IO+御三家+常用流媒体+测速节点5个)")
 			fmt.Println("6. 网络单项(IP质量检测+三网回程+三网路由与延迟+测速节点11个)")
 			fmt.Println("7. 解锁单项(御三家解锁+常用流媒体解锁)")
-			fmt.Println("8. 硬件单项(系统信息+CPU+内存+dd磁盘测试+fio磁盘测试)-待修复")
+			fmt.Println("8. 硬件单项(系统信息+CPU+内存+dd磁盘测试+fio磁盘测试)")
 			fmt.Println("9. IP质量检测(15个数据库的IP检测+邮件端口检测)")
 			fmt.Println("10. 三网回程线路+广州三网路由+全国三网延迟")
 		case "en":
@@ -219,7 +221,7 @@ func main() {
 					cpuTestStatus = true
 					memoryTestStatus = true
 					diskTestStatus = true
-					// TODO 双硬盘类型测试
+					autoChangeDiskTestMethod = false
 					break Loop
 				case "9":
 					securityTestStatus = true
@@ -314,9 +316,14 @@ func main() {
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
-			if diskTestStatus {
+			if diskTestStatus && autoChangeDiskTestMethod {
 				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", diskTestMethod), width)
-				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
+				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
+			} else if diskTestStatus && !autoChangeDiskTestMethod {
+				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "dd"), width)
+				disktest.DiskTest(language, "dd", diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
+				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "fio"), width)
+				disktest.DiskTest(language, "fio", diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
 			}
 		}, tempOutput, output)
 		if onlyChinaTest || pingTestStatus {
@@ -448,9 +455,14 @@ func main() {
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
-			if diskTestStatus {
+			if diskTestStatus && autoChangeDiskTestMethod {
 				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", diskTestMethod), width)
-				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
+				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
+			} else if diskTestStatus && !autoChangeDiskTestMethod {
+				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "dd"), width)
+				disktest.DiskTest(language, "dd", diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
+				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "fio"), width)
+				disktest.DiskTest(language, "fio", diskTestPath, diskMultiCheck, autoChangeDiskTestMethod)
 			}
 		}, tempOutput, output)
 		if utTestStatus {