Split utils package into smaller packages

Author: juho05

cli/input.go

@@ -4,8 +4,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/code-game-project/codegame-cli/cli"
-	"github.com/code-game-project/codegame-cli/util"
+	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/codegame-cli/util/cggenevents"
+	"github.com/code-game-project/codegame-cli/util/exec"
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
 	"github.com/gomarkdown/markdown/parser"
@@ -19,33 +20,26 @@ var docsStyle string
 
 func Docs() error {
 	if pflag.NArg() == 1 {
-		cli.Begin("Opening documentation...")
-		err := util.OpenBrowser("https://docs.code-game.org")
+		cli.Print("Opening documentation...")
+		err := exec.OpenBrowser("https://docs.code-game.org")
 		if err != nil {
 			cli.Error(err.Error())
 		}
-		cli.Finish()
 		return err
 	}
 
-	cli.Begin("Generating markdown documentation...")
-
 	url := baseURL(pflag.Arg(1))
 
-	cgeVersion, err := util.GetCGEVersion(url)
+	cgeVersion, err := cggenevents.GetCGEVersion(url)
 	if err != nil {
 		return err
 	}
 
-	err = util.CGGenEvents(os.TempDir(), url, cgeVersion, "markdown")
+	err = cggenevents.CGGenEvents(os.TempDir(), url, cgeVersion, "markdown")
 	if err != nil {
 		return err
 	}
 
-	cli.Finish()
-
-	cli.Begin("Converting documentation to HTML...")
-
 	md, err := os.ReadFile(filepath.Join(os.TempDir(), "event_docs.md"))
 	if err != nil {
 		return cli.Error(err.Error())
@@ -69,16 +63,12 @@ func Docs() error {
 		return cli.Error(err.Error())
 	}
 
-	cli.Finish()
+	cli.Print("Opening documentation...")
 
-	cli.Begin("Opening documentation...")
-
-	err = util.OpenBrowser(filepath.Join(os.TempDir(), "event_docs.html"))
+	err = exec.OpenBrowser(filepath.Join(os.TempDir(), "event_docs.html"))
 	if err != nil {
 		cli.Error(err.Error())
 	}
 
-	cli.Finish()
-
 	return nil
 }

cli/output.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/code-game-project/codegame-cli/cli"
-	"github.com/code-game-project/codegame-cli/util"
+	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/codegame-cli/util/external"
 	"github.com/mattn/go-colorable"
 	"github.com/ogier/pflag"
 )
@@ -45,7 +45,7 @@ func Info() error {
 
 	printInfo(info)
 
-	cli.Info("\nTo view the documentation of this game run:\n%s docs %s", os.Args[0], url)
+	cli.PrintColor(cli.Yellow, "\nTo view the documentation of this game run:\n%s docs %s", os.Args[0], url)
 	return nil
 }
 
@@ -78,7 +78,7 @@ func fetchInfo(url string) (gameInfo, error) {
 	if err != nil || res.StatusCode != http.StatusOK {
 		return gameInfo{}, cli.Error("Couldn't access %s.", url)
 	}
-	if !util.HasContentType(res.Header, "application/json") {
+	if !external.HasContentType(res.Header, "application/json") {
 		return gameInfo{}, cli.Error("%s doesn't return JSON.", url)
 	}
 	defer res.Body.Close()