feat: ✅ improve error handling

Author: OnCloud125252

commands/install.go

@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"log"
+	"errors"
 	"os/exec"
 	"path/filepath"
 
@@ -11,48 +11,51 @@ import (
 	"ui/cli/module"
 )
 
-func Install(c *cli.Context) {
+func Install(c *cli.Context) error {
 	var cmd = exec.Command("sudo", "-v")
 	cmd.Stdout = nil
 	err := cmd.Run()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	module.CreateCacheDotFolder()
 	config, err := module.GetSource()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	packageName := c.Args().Get(0)
 	if packageName != "" {
 		for _, file := range config.Source {
 			if file.Name == packageName {
 				filePath := module.DownloadFileToCache(file.URL)
-				installPackage(filePath)
-				return
+				err = installPackage(filePath)
+				if err != nil {
+					return err
+				}
+				return nil
 			}
 		}
-		log.Fatal("Package not found")
-	}
-
-	for _, file := range config.Source {
-		filePath := module.DownloadFileToCache(file.URL)
-		installPackage(filePath)
+		color.Redln("Package not found.")
+		return errors.New("1")
+	} else {
+		color.Redln("No package specified.")
+		return errors.New("1")
 	}
 }
 
-func installPackage(filePath string) {
+func installPackage(filePath string) error {
 	fileName := filepath.Base(filePath)
 
 	color.Yellowln("Installing", fileName)
 	module.FullWidthMessage("installation log start", color.Gray)
 	err := module.InstallPackageWithFilePath(filePath)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	module.FullWidthMessage("installation log end", color.Gray)
 	color.Greenln("Successfully installed", fileName)
+	return nil
 }

commands/source.go

@@ -1,37 +1,37 @@
 package commands
 
 import (
-	"log"
-	"ui/cli/module"
-
 	"github.com/gookit/color"
 	"github.com/urfave/cli/v2"
+
+	"ui/cli/module"
 )
 
-func Source(c *cli.Context) {
+func Source(c *cli.Context) error {
 	if c.Args().Get(0) == "list" || (c.String("name") == "") || (c.String("url") == "") {
 		config, err := module.GetSource()
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 
 		if len(config.Source) == 0 {
-			color.Yellowln("No files are installed.")
-			return
+			color.Yellowln("There are no package in source.")
+			return nil
 		}
 
 		for _, file := range config.Source {
 			color.Cyanf("%s: ", file.Name)
 			color.Greenln(file.URL)
 		}
 
-		return
+		return nil
 	}
 
 	config, err := module.SetSource(c.String("name"), c.String("url"))
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	module.SaveToConfigFile(config)
+	return nil
 }

commands/update-self.go

@@ -2,21 +2,21 @@ package commands
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
-	"ui/cli/module"
 
 	"github.com/gookit/color"
 	"github.com/urfave/cli/v2"
+
+	"ui/cli/module"
 )
 
-func UpdateSelf(c *cli.Context) {
+func UpdateSelf(c *cli.Context) error {
 	var cmd = exec.Command("sudo", "-v")
 	cmd.Stdout = nil
 	err := cmd.Run()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	color.Yellowln("Updating ui-cli")
@@ -30,17 +30,17 @@ func UpdateSelf(c *cli.Context) {
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
-	fmt.Println("Moved", filePath, "to /usr/local/bin")
+	color.Greenln("Moved", filePath, "to /usr/local/bin")
 	cmd = exec.Command("sudo", "chmod", "+x", "/usr/local/bin/ui")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
-	fmt.Println("Changed permission for /usr/local/bin/ui")
+	color.Greenln("Changed permission for /usr/local/bin/ui")
 	module.FullWidthMessage("installation log end", color.Gray)
 
 	color.Greenf("Successfully updated ui-cli to ")
@@ -49,6 +49,7 @@ func UpdateSelf(c *cli.Context) {
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
+	return nil
 }

commands/version.go

@@ -0,0 +1,12 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v2"
+)
+
+func Version(ctx *cli.Context) error {
+	fmt.Println(ctx.App.Version)
+	return nil
+}

main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"fmt"
-	"log"
 	"os"
+	"strconv"
 
+	"github.com/gookit/color"
 	"github.com/urfave/cli/v2"
 
 	"ui/cli/commands"
@@ -21,10 +21,7 @@ func main() {
 				Name:    "version",
 				Aliases: []string{"v"},
 				Usage:   "show the version of ui",
-				Action: func(ctx *cli.Context) error {
-					fmt.Println(ctx.App.Version)
-					return nil
-				},
+				Action:  commands.Version,
 			},
 			{
 				Name:        "install",
@@ -38,10 +35,7 @@ func main() {
 						Usage:   "name of the file to install",
 					},
 				},
-				Action: func(ctx *cli.Context) error {
-					commands.Install(ctx)
-					return nil
-				},
+				Action: commands.Install,
 			},
 			{
 				Name:        "source",
@@ -60,10 +54,7 @@ func main() {
 						Usage:   "url of the source",
 					},
 				},
-				Action: func(ctx *cli.Context) error {
-					commands.Source(ctx)
-					return nil
-				},
+				Action: commands.Source,
 			},
 			{
 				Name:    "update-self",
@@ -78,6 +69,13 @@ func main() {
 	}
 
 	if err := app.Run(os.Args); err != nil {
-		log.Fatal(err)
+		var errorString = err.Error()
+
+		if errorNumber, err := strconv.Atoi(errorString); err == nil {
+			os.Exit(errorNumber)
+		}
+
+		color.Redln(errorString)
+		os.Exit(1)
 	}
 }

module/config.go

@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"path/filepath"
+
+	"github.com/gookit/color"
 )
 
 type SourceObject struct {
@@ -18,13 +19,12 @@ type SourceJSON struct {
 	Source []SourceObject `json:"source"`
 }
 
-func CreateConfigFile() {
+func CreateConfigFile() error {
 	home, err := os.UserHomeDir()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
-	// create dot folder if it is not exist.
 	CreateCacheDotFolder()
 
 	path := filepath.Join(home, ".ui")
@@ -33,14 +33,15 @@ func CreateConfigFile() {
 	if os.IsNotExist(err) {
 		file, err := os.Create(configPath)
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 		defer file.Close()
 		_, err = file.WriteString("{}")
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 	}
+	return nil
 }
 
 func GetSource() (SourceJSON, error) {
@@ -51,7 +52,10 @@ func GetSource() (SourceJSON, error) {
 		return config, err
 	}
 
-	CreateConfigFile()
+	err = CreateConfigFile()
+	if err != nil {
+		return config, err
+	}
 
 	configFilePath := filepath.Join(home, ".ui", "config.json")
 
@@ -80,15 +84,15 @@ func SetSource(name string, URL string) (SourceJSON, error) {
 
 	for i, file := range config.Source {
 		if file.Name == name {
-			fmt.Printf("The URL of the name is already exist. Would you like to change the URL of %s? (y/N) ", name)
+			color.Yellowf("The URL of the name is already exist. Would you like to change the URL of %s? (y/N) ", name)
 			var answer string
 			fmt.Scanln(&answer)
 
 			if answer == "y" || answer == "Y" {
 				config.Source[i].URL = URL
 				return config, nil
 			} else {
-				fmt.Println("No changes were made")
+				color.Redln("No changes were made.")
 				return config, nil
 			}
 		}