v0.0.2 - 修复一些可能的BUG

oneclickvirt · Jun 29, 2024 · d451dfd · d451dfd
1 parent 12fe306
commit d451dfd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -23,7 +23,7 @@ func main() {
 	flag.BoolVar(&showHead, "s", true, "Show head")
 	flag.StringVar(&language, "l", "zh", "Language parameter (options: en, zh)")
 	flag.StringVar(&platform, "pf", "net", "Platform parameter (options: net, cn)")
-	flag.StringVar(&operator, "opt", "", "Operator parameter (options: cmcc, cu, ct, sg, tw, jp, hk, global)")
+	flag.StringVar(&operator, "opt", "global", "Operator parameter (options: cmcc, cu, ct, sg, tw, jp, hk, global)")
 	flag.IntVar(&num, "num", -1, "Number of test servers, default -1 not to limit")
 	flag.Parse()
 	if showVersion {
@@ -38,7 +38,7 @@ func main() {
 		return
 	}
 	var url, parseType string
-	if strings.ToLower(platform) == "net" {
+	if strings.ToLower(platform) == "cn" {
 		if strings.ToLower(operator) == "cmcc" {
 			url = model.CnCMCC
 		} else if strings.ToLower(operator) == "cu" {
@@ -54,8 +54,8 @@ func main() {
 		} else if strings.ToLower(operator) == "sg" {
 			url = model.CnSG
 		}
-		parseType = "id"
-	} else if strings.ToLower(platform) == "cn" {
+		parseType = "url"
+	} else if strings.ToLower(platform) == "net" {
 		if strings.ToLower(operator) == "cmcc" {
 			url = model.NetCMCC
 		} else if strings.ToLower(operator) == "cu" {
@@ -70,8 +70,10 @@ func main() {
 			url = model.NetJP
 		} else if strings.ToLower(operator) == "sg" {
 			url = model.NetSG
+		} else if strings.ToLower(operator) == "global" {
+			url = model.NetGlobal
 		}
-		parseType = "url"
+		parseType = "id"
 	}
 	if url != "" {
 		sp.CustomSpeedTest(url, parseType, num)

diff --git a/cmd/main_test.go b/cmd/main_test.go
@@ -5,4 +5,5 @@ import "testing"
 func Test(t *testing.T) {
 	main()
 }
-// /usr/local/go/bin/go test -timeout 360s -run ^Test$ github.com/oneclickvirt/speedtest/cmd
+
+// /usr/local/go/bin/go test -timeout 360s -run ^Test$ github.com/oneclickvirt/speedtest/cmd
diff --git a/sp/sp.go b/sp/sp.go
@@ -157,7 +157,7 @@ func CustomSpeedTest(url, byWhat string, num int) {
 	})
 	analyzer := speedtest.NewPacketLossAnalyzer(nil)
 	var PacketLoss string
-	if num == -1 && num >= len(pingList) {
+	if num == -1 || num >= len(pingList) {
 		num = len(pingList)
 	} else if len(pingList) == 0 {
 		fmt.Println("No match servers")