Also show sponsor info in server list

Author: maddie

defs/server.go

@@ -424,3 +424,24 @@ func (s *Server) GetURL() (*url.URL, error) {
 	}
 	return u, nil
 }
+
+// Sponsor returns the sponsor's info
+func (s *Server) Sponsor() string {
+	var sponsorMsg string
+	if s.SponsorName != "" {
+		sponsorMsg += s.SponsorName
+
+		if s.SponsorURL != "" {
+			su, err := url.Parse(s.SponsorURL)
+			if err != nil {
+				log.Debugf("Sponsor URL is invalid: %s", s.SponsorURL)
+			} else {
+				if su.Scheme == "" {
+					su.Scheme = "https"
+				}
+				sponsorMsg += " @ " + su.String()
+			}
+		}
+	}
+	return sponsorMsg
+}

speedtest/helper.go

@@ -8,7 +8,6 @@ import (
 	"math"
 	"mime/multipart"
 	"net/http"
-	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -46,23 +45,7 @@ func doSpeedTest(c *cli.Context, servers []defs.Server, telemetryServer defs.Tel
 
 		log.Infof("Selected server: %s [%s]", currentServer.Name, u.Hostname())
 
-		var sponsorMsg string
-		if currentServer.SponsorName != "" {
-			sponsorMsg += currentServer.SponsorName
-
-			if currentServer.SponsorURL != "" {
-				su, err := url.Parse(currentServer.SponsorURL)
-				if err != nil {
-					log.Debugf("Sponsor URL is invalid: %s", currentServer.SponsorURL)
-				} else {
-					if su.Scheme == "" {
-						su.Scheme = "https"
-					}
-					sponsorMsg += " @ " + su.String()
-				}
-			}
-		}
-		if sponsorMsg != "" {
+		if sponsorMsg := currentServer.Sponsor(); sponsorMsg != "" {
 			log.Infof("Sponsored by: %s", sponsorMsg)
 		}
 

speedtest/speedtest.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -235,7 +236,11 @@ func SpeedTest(c *cli.Context) error {
 	// if --list is given, list all the servers fetched and exit
 	if c.Bool(defs.OptionList) {
 		for idx, svr := range servers {
-			log.Warnf("%d: %s (%s)", idx, svr.Name, svr.Server)
+			var sponsorMsg string
+			if svr.Sponsor() != "" {
+				sponsorMsg = fmt.Sprintf(" [Sponsor: %s]", svr.Sponsor())
+			}
+			log.Warnf("%d: %s (%s) %s", idx, svr.Name, svr.Server, sponsorMsg)
 		}
 		return nil
 	}