change: remove saving-mode to userconfig

Author: r3inbowari

README.md

@@ -35,7 +35,7 @@ Flags:
   -l, --list                   Show available speedtest.net servers.
   -s, --server=SERVER ...      Select server id to speedtest.
       --custom-url=CUSTOM-URL  Specify the url of the server instead of getting a list from speedtest.net.
-      --saving-mode            Test with few computing resources, though low accuracy (especially > 30Mbps).
+      --saving-mode            Test with few resources, though low accuracy (especially > 30Mbps).
       --json                   Output results in json format.
       --location=LOCATION      Change the location with a precise coordinate.
       --city=CITY              Change the location with a predefined city label.
@@ -185,8 +185,8 @@ func main() {
 		// otherwise you will get an error.
 		// It is recommended to replace a server at this time
 		s.PingTest()
-		s.DownloadTest(false)
-		s.UploadTest(false)
+		s.DownloadTest()
+		s.UploadTest()
 		fmt.Printf("Latency: %s, Download: %f, Upload: %f\n", s.Latency, s.DLSpeed, s.ULSpeed)
 	}
 }

example/main.go

@@ -23,8 +23,8 @@ func main() {
 		// otherwise you will get an error.
 		// It is recommended to replace a server at this time
 		checkError(s.PingTest())
-		checkError(s.DownloadTest(false))
-		checkError(s.UploadTest(false))
+		checkError(s.DownloadTest())
+		checkError(s.UploadTest())
 
 		fmt.Printf("Latency: %s, Download: %f, Upload: %f\n", s.Latency, s.DLSpeed, s.ULSpeed)
 		//speedtest.GlobalDataManager.Reset()

speedtest.go

@@ -17,7 +17,7 @@ var (
 	showList     = kingpin.Flag("list", "Show available speedtest.net servers.").Short('l').Bool()
 	serverIds    = kingpin.Flag("server", "Select server id to run speedtest.").Short('s').Ints()
 	customURL    = kingpin.Flag("custom-url", "Specify the url of the server instead of getting a list from speedtest.net.").String()
-	savingMode   = kingpin.Flag("saving-mode", "Test with few computing resources, though low accuracy (especially > 30Mbps).").Bool()
+	savingMode   = kingpin.Flag("saving-mode", "Test with few resources, though low accuracy (especially > 30Mbps).").Bool()
 	jsonOutput   = kingpin.Flag("json", "Output results in json format.").Bool()
 	location     = kingpin.Flag("location", "Change the location with a precise coordinate. Format: lat,lon").String()
 	city         = kingpin.Flag("city", "Change the location with a predefined city label.").String()
@@ -125,21 +125,21 @@ func startMultiTest(s *speedtest.Server, servers speedtest.Servers, savingMode b
 	checkError(err)
 
 	if jsonOutput {
-		err = s.MultiDownloadTestContext(context.Background(), servers, savingMode)
+		err = s.MultiDownloadTestContext(context.Background(), servers)
 		checkError(err)
 		s.Context.Wait()
-		err = s.MultiUploadTestContext(context.Background(), servers, savingMode)
+		err = s.MultiUploadTestContext(context.Background(), servers)
 		checkError(err)
 		return
 	}
 
 	showLatencyResult(s)
-	err = testDownloadM(s, servers, savingMode)
+	err = testDownloadM(s, servers)
 	checkError(err)
 	// It is necessary to wait for the release of the last test resource,
 	// otherwise the overload will cause excessive data deviation
 	s.Context.Wait()
-	err = testUploadM(s, servers, savingMode)
+	err = testUploadM(s, servers)
 	checkError(err)
 	showServerResult(s)
 }
@@ -156,22 +156,22 @@ func startTest(servers speedtest.Servers, savingMode bool, jsonOutput bool) {
 		checkError(err)
 
 		if jsonOutput {
-			err = s.DownloadTest(savingMode)
+			err = s.DownloadTest()
 			checkError(err)
 			s.Context.Wait()
-			err = s.UploadTest(savingMode)
+			err = s.UploadTest()
 			checkError(err)
 			continue
 		}
 
 		showLatencyResult(s)
 
-		err = testDownload(s, savingMode)
+		err = testDownload(s)
 		checkError(err)
 		// It is necessary to wait for the release of the last test resource,
 		// otherwise the overload will cause excessive data deviation
 		s.Context.Wait()
-		err = testUpload(s, savingMode)
+		err = testUpload(s)
 		checkError(err)
 		showServerResult(s)
 	}
@@ -181,11 +181,11 @@ func startTest(servers speedtest.Servers, savingMode bool, jsonOutput bool) {
 	}
 }
 
-func testDownloadM(server *speedtest.Server, servers speedtest.Servers, savingMode bool) error {
+func testDownloadM(server *speedtest.Server, servers speedtest.Servers) error {
 	quit := make(chan bool)
 	fmt.Printf("Download Test: ")
 	go dots(quit)
-	err := server.MultiDownloadTestContext(context.Background(), servers, savingMode)
+	err := server.MultiDownloadTestContext(context.Background(), servers)
 	checkError(err)
 	quit <- true
 	if err != nil {
@@ -195,11 +195,11 @@ func testDownloadM(server *speedtest.Server, servers speedtest.Servers, savingMo
 	return err
 }
 
-func testUploadM(server *speedtest.Server, servers speedtest.Servers, savingMode bool) error {
+func testUploadM(server *speedtest.Server, servers speedtest.Servers) error {
 	quit := make(chan bool)
 	fmt.Printf("Upload Test: ")
 	go dots(quit)
-	err := server.MultiUploadTestContext(context.Background(), servers, savingMode)
+	err := server.MultiUploadTestContext(context.Background(), servers)
 	checkError(err)
 	quit <- true
 	if err != nil {
@@ -209,11 +209,11 @@ func testUploadM(server *speedtest.Server, servers speedtest.Servers, savingMode
 	return nil
 }
 
-func testDownload(server *speedtest.Server, savingMode bool) error {
+func testDownload(server *speedtest.Server) error {
 	quit := make(chan bool)
 	fmt.Printf("Download Test: ")
 	go dots(quit)
-	err := server.DownloadTest(savingMode)
+	err := server.DownloadTest()
 	quit <- true
 	if err != nil {
 		return err
@@ -222,11 +222,11 @@ func testDownload(server *speedtest.Server, savingMode bool) error {
 	return err
 }
 
-func testUpload(server *speedtest.Server, savingMode bool) error {
+func testUpload(server *speedtest.Server) error {
 	quit := make(chan bool)
 	fmt.Printf("Upload Test: ")
 	go dots(quit)
-	err := server.UploadTest(savingMode)
+	err := server.UploadTest()
 	quit <- true
 	if err != nil {
 		return err

speedtest/request.go

@@ -22,7 +22,7 @@ var (
 	ulSizes = [...]int{100, 300, 500, 800, 1000, 1500, 2500, 3000, 3500, 4000} // kB
 )
 
-func (s *Server) MultiDownloadTestContext(ctx context.Context, servers Servers, savingMode bool) error {
+func (s *Server) MultiDownloadTestContext(ctx context.Context, servers Servers) error {
 	if s.Context.config.NoDownload {
 		dbg.Println("Download test disabled")
 		return nil
@@ -49,7 +49,7 @@ func (s *Server) MultiDownloadTestContext(ctx context.Context, servers Servers,
 	return nil
 }
 
-func (s *Server) MultiUploadTestContext(ctx context.Context, servers Servers, savingMode bool) error {
+func (s *Server) MultiUploadTestContext(ctx context.Context, servers Servers) error {
 	if s.Context.config.NoUpload {
 		dbg.Println("Upload test disabled")
 		return nil
@@ -77,7 +77,7 @@ func (s *Server) MultiUploadTestContext(ctx context.Context, servers Servers, sa
 }
 
 // DownloadTest executes the test to measure download speed
-func (s *Server) DownloadTest(savingMode bool) error {
+func (s *Server) DownloadTest() error {
 	return s.downloadTestContext(context.Background(), downloadRequest)
 }
 
@@ -100,12 +100,12 @@ func (s *Server) downloadTestContext(ctx context.Context, downloadRequest downlo
 }
 
 // UploadTest executes the test to measure upload speed
-func (s *Server) UploadTest(savingMode bool) error {
+func (s *Server) UploadTest() error {
 	return s.uploadTestContext(context.Background(), uploadRequest)
 }
 
 // UploadTestContext executes the test to measure upload speed, observing the given context.
-func (s *Server) UploadTestContext(ctx context.Context, savingMode bool) error {
+func (s *Server) UploadTestContext(ctx context.Context) error {
 	return s.uploadTestContext(ctx, uploadRequest)
 }
 

speedtest/speedtest.go

@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	version          = "1.5.1"
+	version          = "1.5.2"
 	DefaultUserAgent = fmt.Sprintf("showwin/speedtest-go %s", version)
 )