Fix download message

Author: juho05

go.mod

@@ -3,7 +3,7 @@ module github.com/code-game-project/codegame-cli-go
 go 1.18
 
 require (
-	github.com/code-game-project/codegame-cli v0.5.1
+	github.com/code-game-project/codegame-cli v0.5.2
 	github.com/spf13/pflag v1.0.5
 )
 

go.sum

@@ -4,8 +4,8 @@ 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/codegame-cli v0.5.1 h1:6AoWoEbLQpRCnoCVY1aqSQoTJUF1Z9JW6JIEgFMT1zc=
-github.com/code-game-project/codegame-cli v0.5.1/go.mod h1:EIgSdxiXvcgVuGLmhMgif+jpyPyi4o0xelpMHhRJG0I=
+github.com/code-game-project/codegame-cli v0.5.2 h1:CTNbA+Wz9EL0XmbHlQa1Wj7TWjwLql0HC+TpTVxvfsc=
+github.com/code-game-project/codegame-cli v0.5.2/go.mod h1:BhnklYelnBEX3q4P+pQvwv+5RisjeiFsCJ8/nBJ6Eww=
 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=

new/client/client.go

@@ -48,13 +48,21 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 	}
 	cli.Finish()
 
-	cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))
-	if err != nil {
-		return err
+	var eventNames []string
+	if generateWrappers {
+		cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))
+		if err != nil {
+			return err
+		}
+
+		eventNames, err = util.GetEventNames(baseURL(serverURL, isSSL(serverURL)), cgeVersion)
+		if err != nil {
+			return err
+		}
 	}
 
 	cli.Begin("Creating project template...")
-	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, cgeVersion, generateWrappers)
+	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers, eventNames)
 	if err != nil {
 		return err
 	}
@@ -82,12 +90,12 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 	return nil
 }
 
-func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion string, wrappers bool) error {
+func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL string, wrappers bool, eventNames []string) error {
 	if !wrappers {
 		return execGoClientMainTemplate(projectName, serverURL, libraryURL)
 	}
 
-	return execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion)
+	return execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, eventNames)
 }
 
 func getGoClientLibraryURL(clientVersion string) (url string, tag string, err error) {
@@ -125,16 +133,11 @@ func execGoClientMainTemplate(projectName, serverURL, libraryURL string) error {
 	})
 }
 
-func execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion string) error {
+func execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL string, eventNames []string) error {
 	gamePackageName := strings.ReplaceAll(strings.ReplaceAll(gameName, "-", ""), "_", "")
 
 	gameDir := strings.ReplaceAll(strings.ReplaceAll(gameName, "-", ""), "_", "")
 
-	eventNames, err := util.GetEventNames(baseURL(serverURL, isSSL(serverURL)), cgeVersion)
-	if err != nil {
-		return err
-	}
-
 	type event struct {
 		Name       string
 		PascalName string
@@ -165,7 +168,7 @@ func execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL,
 		Events:      events,
 	}
 
-	err = new.ExecTemplate(goClientWrapperMainTemplate, filepath.Join("main.go"), data)
+	err := new.ExecTemplate(goClientWrapperMainTemplate, filepath.Join("main.go"), data)
 	if err != nil {
 		return err
 	}