Improve error handling

Author: juho05

cli/output.go

@@ -5,27 +5,53 @@ import (
 	"fmt"
 )
 
+var inProgress = false
+
+func IsInProgress() bool {
+	return inProgress
+}
+
 func Info(format string, a ...any) {
+	if inProgress {
+		fmt.Println()
+		inProgress = false
+	}
 	fmt.Printf("%s\n", fmt.Sprintf(format, a...))
 }
 
 func Begin(format string, a ...any) {
 	fmt.Printf(format, a...)
+	inProgress = true
 }
 
 func Finish() {
-	fmt.Print(" done.\n")
+	if inProgress {
+		fmt.Print(" done.\n")
+		inProgress = false
+	}
 }
 
 func Success(format string, a ...any) {
+	if inProgress {
+		fmt.Println()
+		inProgress = false
+	}
 	fmt.Printf("\x1b[32m%s\x1b[0m\n", fmt.Sprintf(format, a...))
 }
 
 func Warn(format string, a ...any) {
+	if inProgress {
+		fmt.Println()
+		inProgress = false
+	}
 	fmt.Printf("\x1b[33mWARNING: %s\x1b[0m\n", fmt.Sprintf(format, a...))
 }
 
 func Error(format string, a ...any) error {
+	if inProgress {
+		fmt.Println()
+		inProgress = false
+	}
 	message := fmt.Sprintf(format, a...)
 	fmt.Printf("\x1b[1;31mERROR: %s\x1b[0m\n", message)
 	return errors.New(message)

commands/new.go

@@ -19,7 +19,7 @@ func New() error {
 		project = strings.ToLower(pflag.Arg(1))
 	} else {
 		var err error
-		project, err = cli.Select("Which type of project would you like to create?", []string{"Game Server", "Game Client"}, []string{"server", "client"})
+		project, err = cli.Select("Which type of project would you like to create?", []string{"Game Client", "Game Server"}, []string{"client", "server"})
 		if err != nil {
 			return err
 		}
@@ -126,7 +126,7 @@ func getCodeGameInfo(baseURL string) (string, string, error) {
 		CGVersion string `json:"cg_version"`
 	}
 	res, err := http.Get(baseURL + "/info")
-	if err != nil || res.StatusCode != http.StatusOK {
+	if err != nil || res.StatusCode != http.StatusOK || !external.HasContentType(res.Header, "application/json") {
 		return "", "", cli.Error("Couldn't access /info endpoint.")
 	}
 	defer res.Body.Close()
@@ -142,7 +142,7 @@ func getCodeGameInfo(baseURL string) (string, string, error) {
 
 func getCGEVersion(baseURL string) (string, error) {
 	res, err := http.Get(baseURL + "/events")
-	if err != nil || res.StatusCode != http.StatusOK {
+	if err != nil || res.StatusCode != http.StatusOK || !external.HasContentType(res.Header, "text/plain") {
 		return "", cli.Error("Couldn't access /events endpoint.")
 	}
 	defer res.Body.Close()

commands/new_go.go

@@ -33,10 +33,12 @@ func newClientGo(projectName, serverURL, cgVersion string) error {
 		return err
 	}
 
-	err = external.ExecuteInDir(projectName, "goimports", "-w", "main.go")
-	if err != nil {
-		cli.Warn("Failed to add import statements: %s", err)
+	if !external.IsInstalled("goimports") {
+		cli.Warn("Failed to add import statements: 'goimports' is not installed!")
+		return nil
 	}
+
+	external.ExecuteInDir(projectName, "goimports", "-w", "main.go")
 	cli.Finish()
 
 	return nil
@@ -51,7 +53,9 @@ func createGoTemplate(projectName, serverURL string) error {
 	cli.Begin("Creating project template...")
 	out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "init", module)
 	if err != nil {
-		fmt.Println(out)
+		if out != "" {
+			cli.Error(out)
+		}
 		return err
 	}
 
@@ -84,8 +88,8 @@ func installGoLibrary(projectName, cgVersion string) error {
 
 	if clientVersion == "latest" {
 		out, err := external.ExecuteInDirHidden(projectName, "go", "get")
-		if err != nil {
-			fmt.Println(out)
+		if err != nil && out != "" {
+			cli.Error(out)
 		}
 		return err
 	}

external/external.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"mime"
 	"net/http"
 	"os"
 	"os/exec"
@@ -24,6 +25,10 @@ func IsInstalled(programName string) bool {
 }
 
 func Execute(programName string, args ...string) error {
+	if _, err := exec.LookPath(programName); err != nil {
+		cli.Error("'%s' ist not installed!", programName)
+		return err
+	}
 	cmd := exec.Command(programName, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@@ -32,6 +37,10 @@ func Execute(programName string, args ...string) error {
 }
 
 func ExecuteInDir(workingDir, programName string, args ...string) error {
+	if _, err := exec.LookPath(programName); err != nil {
+		cli.Error("'%s' ist not installed!", programName)
+		return err
+	}
 	cmd := exec.Command(programName, args...)
 	cmd.Dir = workingDir
 	cmd.Stdin = os.Stdin
@@ -41,12 +50,20 @@ func ExecuteInDir(workingDir, programName string, args ...string) error {
 }
 
 func ExecuteHidden(programName string, args ...string) (string, error) {
+	if _, err := exec.LookPath(programName); err != nil {
+		cli.Error("'%s' ist not installed!", programName)
+		return "", err
+	}
 	cmd := exec.Command(programName, args...)
 	out, err := cmd.CombinedOutput()
 	return string(out), err
 }
 
 func ExecuteInDirHidden(workingDir, programName string, args ...string) (string, error) {
+	if _, err := exec.LookPath(programName); err != nil {
+		cli.Error("'%s' ist not installed!", programName)
+		return "", err
+	}
 	cmd := exec.Command(programName, args...)
 	cmd.Dir = workingDir
 	out, err := cmd.CombinedOutput()
@@ -83,7 +100,7 @@ func OpenBrowser(url string) error {
 
 func GithubTagFromVersion(owner, repo, version string) (string, error) {
 	res, err := http.Get(fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", owner, repo))
-	if err != nil || res.StatusCode != http.StatusOK {
+	if err != nil || res.StatusCode != http.StatusOK || !HasContentType(res.Header, "application/json") {
 		return "", cli.Error("Couldn't access git tags from 'github.com/%s/%s'.", owner, repo)
 	}
 	defer res.Body.Close()
@@ -190,3 +207,20 @@ func ClientVersionFromCGVersion(owner, repo, cgVersion string) string {
 	cli.Warn("No compatible client library version found. Using latest client library version.")
 	return "latest"
 }
+func HasContentType(h http.Header, mimetype string) bool {
+	contentType := h.Get("Content-type")
+	if contentType == "" {
+		return mimetype == "application/octet-stream"
+	}
+
+	for _, v := range strings.Split(contentType, ",") {
+		t, _, err := mime.ParseMediaType(v)
+		if err != nil {
+			break
+		}
+		if t == mimetype {
+			return true
+		}
+	}
+	return false
+}

go.mod

@@ -5,10 +5,13 @@ go 1.18
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.4
 	github.com/adrg/xdg v0.4.0
+	github.com/code-game-project/go-client v0.7.0
 	github.com/ogier/pflag v0.0.1
 )
 
 require (
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-isatty v0.0.8 // indirect

go.sum

@@ -4,11 +4,17 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
+github.com/code-game-project/go-client v0.7.0 h1:XLwh4yKjStEwfa0AZd6ybIP1QbATxaHiU/RyozF6puw=
+github.com/code-game-project/go-client v0.7.0/go.mod h1:ZhvVYMFPFipoWXrLJlKaIN9NSYl9ucvHTk9vVdqEj24=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=

main.go

@@ -46,11 +46,14 @@ func main() {
 			cli.Error(err.Error())
 		}
 	default:
-		cli.Error("Unknown command:", strings.ToLower(pflag.Arg(0)))
+		cli.Error("Unknown command: %s", strings.ToLower(pflag.Arg(0)))
 		pflag.Usage()
 		os.Exit(1)
 	}
 	if err != nil {
+		if cli.IsInProgress() {
+			fmt.Println()
+		}
 		os.Exit(1)
 	}
 }