Generate .codegame.json file

Author: juho05

commands/docs.go

@@ -35,7 +35,7 @@ func Docs() error {
 		return err
 	}
 
-	err = cggenevents.CGGenEvents(os.TempDir(), url, cgeVersion, "markdown")
+	err = cggenevents.CGGenEvents(cgeVersion, os.TempDir(), url, "markdown")
 	if err != nil {
 		return err
 	}

commands/new.go

@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/codegame-cli/util/cgfile"
 	"github.com/code-game-project/codegame-cli/util/cggenevents"
 	"github.com/code-game-project/codegame-cli/util/exec"
 	"github.com/code-game-project/codegame-cli/util/external"
@@ -100,7 +101,16 @@ func newServer(projectName string) error {
 		}
 	}
 
-	var err error
+	file := cgfile.CodeGameFileData{
+		Game: projectName,
+		Type: "server",
+		Lang: language,
+	}
+	err := file.Write("")
+	if err != nil {
+		return cli.Error("Failed to create .codegame.json: %s", err)
+	}
+
 	switch language {
 	case "go":
 		err = modules.Execute("go", "latest", "server", "new", "server")
@@ -130,13 +140,13 @@ func newServer(projectName string) error {
 		return err
 	}
 
-	file, err := os.Create("events.cge")
+	eventsFile, err := os.Create("events.cge")
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer eventsFile.Close()
 
-	return tmpl.Execute(file, data{
+	return tmpl.Execute(eventsFile, data{
 		SnakeCaseName: strings.ReplaceAll(projectName, "-", "_"),
 		CGEVersion:    cgeVersion,
 	})
@@ -173,6 +183,17 @@ func newClient() error {
 		return cli.Error(err.Error())
 	}
 
+	file := cgfile.CodeGameFileData{
+		Game: name,
+		Type: "client",
+		Lang: language,
+		URL:  trimURL(url),
+	}
+	err = file.Write("")
+	if err != nil {
+		return cli.Error("Failed to create .codegame.json: %s", err)
+	}
+
 	switch language {
 	case "go":
 		libraryVersion := external.LibraryVersionFromCGVersion("code-game-project", "go-client", cgVersion)
@@ -196,7 +217,7 @@ func newClient() error {
 	}
 
 	if language == "go" || language == "ts" {
-		err = cggenevents.CGGenEvents(eventsOutput, url, cgeVersion, language)
+		err = cggenevents.CGGenEvents(cgeVersion, eventsOutput, url, language)
 		if err != nil {
 			return err
 		}
@@ -360,10 +381,11 @@ func writeReadmeLicense(templateText, username string, year int) error {
 	})
 }
 
-func getCodeGameInfo(baseURL string) (string, string, error) {
+func getCodeGameInfo(baseURL string) (name string, cgVersion string, err error) {
 	type response struct {
 		Name      string `json:"name"`
 		CGVersion string `json:"cg_version"`
+		Version   string `json:"version"`
 	}
 	url := baseURL + "/info"
 	res, err := http.Get(url)

go.mod

@@ -18,4 +18,5 @@ require (
 	golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
 	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -50,5 +50,6 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

util/cgfile/codegame_json.go

@@ -0,0 +1,45 @@
+package cgfile
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+)
+
+type CodeGameFileData struct {
+	Game       string         `json:"game"`
+	Type       string         `json:"type"`
+	Lang       string         `json:"lang"`
+	LangConfig map[string]any `json:"lang_config,omitempty"`
+	URL        string         `json:"url,omitempty"`
+}
+
+func LoadCodeGameFile(dir string) (*CodeGameFileData, error) {
+	file, err := os.Open(filepath.Join(dir, ".codegame.json"))
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	data := &CodeGameFileData{}
+	err = json.NewDecoder(file).Decode(data)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, nil
+}
+
+func (c *CodeGameFileData) Write(dir string) error {
+	os.MkdirAll(dir, 0755)
+
+	file, err := os.Create(filepath.Join(dir, ".codegame.json"))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	encoder := json.NewEncoder(file)
+	encoder.SetIndent("", "  ")
+	return encoder.Encode(c)
+}

util/cggenevents/cg_gen_events.go

@@ -49,10 +49,9 @@ func installCGGenEvents(cgeVersion string) (string, error) {
 
 // GetEventNames uses CGGenEvents() to get a list of all the available events of the game server at url.
 // It only works for CGE versions >= 0.3.
-// CGGenEvents must be installed first!
-func GetEventNames(exeName, url string) ([]string, error) {
+func GetEventNames(url, cgeVersion string) ([]string, error) {
 	output := os.TempDir()
-	err := CGGenEvents(exeName, output, url, "json")
+	err := CGGenEvents(cgeVersion, output, url, "json")
 	if err != nil {
 		return nil, err
 	}

util/external/install.go

@@ -19,8 +19,6 @@ import (
 )
 
 func InstallProgram(name, filename, url, version, path string) (string, error) {
-	cli.BeginLoading("Installing %s v%s...", name, version)
-
 	exeName := fmt.Sprintf("%s_%s", name, strings.ReplaceAll(version, ".", "-"))
 	if runtime.GOOS == "windows" {
 		exeName = exeName + ".exe"
@@ -30,6 +28,9 @@ func InstallProgram(name, filename, url, version, path string) (string, error) {
 		return exeName, nil
 	}
 
+	cli.BeginLoading("Installing %s v%s...", name, version)
+	defer cli.CancelLoading()
+
 	downloadFile := fmt.Sprintf("%s-%s-%s.tar.gz", name, runtime.GOOS, runtime.GOARCH)
 	if runtime.GOOS == "windows" {
 		downloadFile = fmt.Sprintf("%s-%s-%s.zip", name, runtime.GOOS, runtime.GOARCH)
@@ -41,10 +42,7 @@ func InstallProgram(name, filename, url, version, path string) (string, error) {
 	}
 	defer res.Body.Close()
 
-	err = os.MkdirAll(path, 0755)
-	if err != nil {
-		return "", err
-	}
+	os.MkdirAll(path, 0755)
 
 	binaries, err := os.ReadDir(path)
 	if err == nil {