Try master branch if main branch doesn't exist

Author: juho05

util/github.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 
@@ -51,19 +52,35 @@ func GithubTagFromVersion(owner, repo, version string) (string, error) {
 }
 
 func LibraryVersionFromCGVersion(owner, repo, cgVersion string) string {
-	res, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/main/versions.json", owner, repo))
-	if err != nil || res.StatusCode != http.StatusOK {
+	body, err := LoadVersionsJSON(owner, repo)
+	if err != nil {
 		cli.Warn("Couldn't fetch versions.json. Using latest client library version.")
 		return "latest"
 	}
-	defer res.Body.Close()
+	defer body.Close()
 
 	var versions map[string]string
-	err = json.NewDecoder(res.Body).Decode(&versions)
+	err = json.NewDecoder(body).Decode(&versions)
 	if err != nil {
 		cli.Warn("Invalid versions.json. Using latest client library version.")
 		return "latest"
 	}
 
 	return CompatibleVersion(versions, cgVersion)
 }
+
+func LoadVersionsJSON(owner, repo string) (io.ReadCloser, error) {
+	res, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/main/versions.json", owner, repo))
+	if res.StatusCode != http.StatusOK {
+		err = errors.New("invalid http status")
+	}
+
+	if err != nil {
+		res, err = http.Get(fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/master/versions.json", owner, repo))
+		if res.StatusCode != http.StatusOK {
+			err = errors.New("invalid http status")
+		}
+	}
+
+	return res.Body, err
+}

util/modules.go

@@ -48,23 +48,23 @@ func findModuleVersion(name, libraryVersion, projectType string) (string, error)
 		return strings.TrimPrefix(version, "v"), err
 	}
 
-	res, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/code-game-project/codegame-cli-%s/main/versions.json", name))
-	if err != nil || res.StatusCode != http.StatusOK {
-		cli.Warn("Couldn't fetch versions.json. Using latest go module version.")
+	body, err := LoadVersionsJSON("code-game-project", "codegame-cli-"+name)
+	if err != nil {
+		cli.Warn("Couldn't fetch versions.json. Using latest %s module version.", name)
 		version, err := LatestGithubTag("code-game-project", "codegame-cli-"+name)
 		return strings.TrimPrefix(version, "v"), err
 	}
-	defer res.Body.Close()
+	defer body.Close()
 
 	type jsonObj struct {
 		Server map[string]string
 		Client map[string]string
 	}
 
 	var versions jsonObj
-	err = json.NewDecoder(res.Body).Decode(&versions)
+	err = json.NewDecoder(body).Decode(&versions)
 	if err != nil {
-		cli.Warn("Invalid versions.json. Using latest go module version.")
+		cli.Warn("Invalid versions.json. Using latest %s module version.", name)
 		version, err := LatestGithubTag("code-game-project", "codegame-cli-"+name)
 		return strings.TrimPrefix(version, "v"), err
 	}