yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: improve log

main
sudo pacman -Syu 2023-02-25 22:36:50 +07:00
parent 8adc79815b
commit 1b322b7c17
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/config/config.go
View File

@ -2,6 +2,7 @@ package config
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -17,7 +18,7 @@ const (
configFileTOML = "data.toml" configFileTOML = "data.toml"
) )
var ErrConfigNotFound = fmt.Errorf("config not found") var ErrConfigNotFound = errors.New("config not found")
type Config interface { type Config interface {
Install() error Install() error
@ -68,7 +69,7 @@ func loadConfigJSON(path string) (*configReal, *configDemo, error) {
var cfgApps ConfigApps var cfgApps ConfigApps
if err = json.Unmarshal(bytes, &cfgApps); err != nil { 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{ cfgReal := configReal{

8
internal/config/config_demo.go
View File

@ -15,7 +15,7 @@ func (c *configDemo) Install() error {
continue 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 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 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 { for dir := range unusedDirs {
fmt.Printf("Remove %s\n", dir) fmt.Printf("Remove [%s]\n", dir)
} }
return nil return nil

12
internal/config/config_real.go
View File

@ -30,7 +30,7 @@ func (c *configReal) Install() error {
} }
if err := copy.Replace(p.Internal, p.External); err != nil { 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 { 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 // Make sure nested dir is exist before copying file
dstDir := filepath.Dir(p.Internal) dstDir := filepath.Dir(p.Internal)
if err := os.MkdirAll(dstDir, os.ModePerm); err != nil { 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 { if err := os.WriteFile(p.Internal, data, 0o600); err != nil {
@ -101,7 +101,7 @@ func (c *configReal) Clean() error {
for dir := range unusedDirs { for dir := range unusedDirs {
dirPath := filepath.Join(configDirPath, dir) dirPath := filepath.Join(configDirPath, dir)
if err := os.RemoveAll(dirPath); err != nil { 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) { func getUnusedDirs(apps map[string]App) (map[string]struct{}, error) {
files, err := os.ReadDir(configDirPath) files, err := os.ReadDir(configDirPath)
if err != nil { 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 // 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 { 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)
} }
} }
} }