From 1b322b7c1702af8ab8290ce8901f0c5115b1e511 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Sat, 25 Feb 2023 22:36:50 +0700
Subject: [PATCH] chore: improve log

---
 internal/config/config.go      |  5 +++--
 internal/config/config_demo.go |  8 ++++----
 internal/config/config_real.go | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 3767e4f..483d4bb 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -17,7 +18,7 @@ const (
 	configFileTOML = "data.toml"
 )
 
-var ErrConfigNotFound = fmt.Errorf("config not found")
+var ErrConfigNotFound = errors.New("config not found")
 
 type Config interface {
 	Install() error
@@ -68,7 +69,7 @@ func loadConfigJSON(path string) (*configReal, *configDemo, error) {
 
 	var cfgApps ConfigApps
 	if err = json.Unmarshal(bytes, &cfgApps); err != nil {
-		return nil, nil, fmt.Errorf("failed to unmarshal: %w", err)
+		return nil, nil, fmt.Errorf("json: failed to unmarshal: %w", err)
 	}
 
 	cfgReal := configReal{
diff --git a/internal/config/config_demo.go b/internal/config/config_demo.go
index 7385862..4486793 100644
--- a/internal/config/config_demo.go
+++ b/internal/config/config_demo.go
@@ -15,7 +15,7 @@ func (c *configDemo) Install() error {
 				continue
 			}
 
-			fmt.Printf("Replace %s -> %s\n", p.Internal, p.External)
+			fmt.Printf("Replace [%s] -> [%s]\n", p.Internal, p.External)
 		}
 	}
 
@@ -29,7 +29,7 @@ func (c *configDemo) Update() error {
 				continue
 			}
 
-			fmt.Printf("Replace %s -> %s\n", p.External, p.Internal)
+			fmt.Printf("Replace [%s] -> [%s]\n", p.External, p.Internal)
 		}
 	}
 
@@ -43,7 +43,7 @@ func (c *configDemo) Download() error {
 				continue
 			}
 
-			fmt.Printf("Download %s -> %s\n", p.URL, p.Internal)
+			fmt.Printf("Download [%s] -> [%s]\n", p.URL, p.Internal)
 		}
 	}
 
@@ -57,7 +57,7 @@ func (c *configDemo) Clean() error {
 	}
 
 	for dir := range unusedDirs {
-		fmt.Printf("Remove %s\n", dir)
+		fmt.Printf("Remove [%s]\n", dir)
 	}
 
 	return nil
diff --git a/internal/config/config_real.go b/internal/config/config_real.go
index 34d7d75..20315d4 100644
--- a/internal/config/config_real.go
+++ b/internal/config/config_real.go
@@ -30,7 +30,7 @@ func (c *configReal) Install() error {
 			}
 
 			if err := copy.Replace(p.Internal, p.External); err != nil {
-				return fmt.Errorf("failed to replace %s -> %s: %w", p.Internal, p.External, err)
+				return fmt.Errorf("copy: failed to replace [%s] -> [%s]: %w", p.Internal, p.External, err)
 			}
 		}
 	}
@@ -47,7 +47,7 @@ func (c *configReal) Update() error {
 			}
 
 			if err := copy.Replace(p.External, p.Internal); err != nil {
-				return fmt.Errorf("failed to replace %s -> %s: %w", p.External, p.Internal, err)
+				return fmt.Errorf("copy: failed to replace [%s] -> [%s]: %w", p.External, p.Internal, err)
 			}
 		}
 	}
@@ -76,7 +76,7 @@ func (c *configReal) Download() error {
 			// Make sure nested dir is exist before copying file
 			dstDir := filepath.Dir(p.Internal)
 			if err := os.MkdirAll(dstDir, os.ModePerm); err != nil {
-				return fmt.Errorf("failed to mkdir %s: %w", dstDir, err)
+				return fmt.Errorf("os: failed to mkdir all [%s]: %w", dstDir, err)
 			}
 
 			if err := os.WriteFile(p.Internal, data, 0o600); err != nil {
@@ -101,7 +101,7 @@ func (c *configReal) Clean() error {
 	for dir := range unusedDirs {
 		dirPath := filepath.Join(configDirPath, dir)
 		if err := os.RemoveAll(dirPath); err != nil {
-			return fmt.Errorf("failed to remove %s: %w", dir, err)
+			return fmt.Errorf("os: failed to remove all [%s]: %w", dir, err)
 		}
 	}
 
@@ -111,7 +111,7 @@ func (c *configReal) Clean() error {
 func getUnusedDirs(apps map[string]App) (map[string]struct{}, error) {
 	files, err := os.ReadDir(configDirPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read dir %s: %w", configDirPath, err)
+		return nil, fmt.Errorf("os: failed to read dir [%s]: %w", configDirPath, err)
 	}
 
 	// Get all dirs inside config dir
@@ -141,7 +141,7 @@ func (c *configReal) Diff() error {
 			}
 
 			if err := diff.Diff(p.Internal, p.External); err != nil {
-				return fmt.Errorf("failed to compare %s with %s: %w", p.Internal, p.External, err)
+				return fmt.Errorf("diff: failed to compare [%s] with [%s]: %w", p.Internal, p.External, err)
 			}
 		}
 	}