aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-10-12 06:45:56 -0700
committerFuwn <[email protected]>2024-10-12 06:45:56 -0700
commit32757ce6d8be9a352c3fcf6b4893edf42e8018bd (patch)
treedcc1f49a751305cdbaf34fcfc8d84cd392903030
parent2f7bb8ceca08d6545e7527289ea395b8b3d28c91 (diff)
downloadyae-32757ce6d8be9a352c3fcf6b4893edf42e8018bd.tar.xz
yae-32757ce6d8be9a352c3fcf6b4893edf42e8018bd.zip
feat(yae): use charmbracelet/log for logging
-rw-r--r--go.mod12
-rw-r--r--go.sum28
-rw-r--r--source.go12
-rw-r--r--yae.go7
4 files changed, 50 insertions, 9 deletions
diff --git a/go.mod b/go.mod
index 4dc332f..e39c76a 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,19 @@ go 1.22.7
require github.com/urfave/cli/v2 v2.27.4
require (
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+ github.com/charmbracelet/lipgloss v0.10.0 // indirect
+ github.com/charmbracelet/log v0.4.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+ github.com/go-logfmt/logfmt v0.6.0 // indirect
+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+ github.com/mattn/go-isatty v0.0.18 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
+ github.com/muesli/reflow v0.3.0 // indirect
+ github.com/muesli/termenv v0.15.2 // indirect
+ github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+ golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+ golang.org/x/sys v0.13.0 // indirect
)
diff --git a/go.sum b/go.sum
index 46bd4d8..016ac31 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,36 @@
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
+github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
+github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
+github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/source.go b/source.go
index fe93da9..8be63d0 100644
--- a/source.go
+++ b/source.go
@@ -3,6 +3,8 @@ package main
import (
"fmt"
"strings"
+
+ "github.com/charmbracelet/log"
)
type Source struct {
@@ -27,7 +29,7 @@ func (source *Source) Update(sources *Sources, name string, show bool, force boo
if source.Pinned && !forcePinned {
if show {
- fmt.Println("skipped update for", name, "because it is pinned")
+ log.Infof("skipped %s: source is pinned", name)
}
return updated, nil
@@ -41,8 +43,8 @@ func (source *Source) Update(sources *Sources, name string, show bool, force boo
}
if tag != source.Version || force || source.Force {
- if show {
- fmt.Println("updated version for", name, "from", source.Version, "to", tag)
+ if show && tag != source.Version {
+ log.Infof("bumped %s: %s -> %s", name, source.Version, tag)
}
if tag != source.Version {
@@ -56,7 +58,7 @@ func (source *Source) Update(sources *Sources, name string, show bool, force boo
}
} else {
if show {
- fmt.Println("skipped update for", name, "because the version is unchanged")
+ log.Infof("skipped %s: version remains unchanged", name)
}
return updated, nil
@@ -71,7 +73,7 @@ func (source *Source) Update(sources *Sources, name string, show bool, force boo
if sha256 != source.SHA256 {
if show {
- fmt.Println("updated hash for", name, "from", source.SHA256, "to", sha256)
+ log.Infof("rehashed %s: %s -> %s", name, source.SHA256, sha256)
}
source.SHA256 = sha256
diff --git a/yae.go b/yae.go
index 16eb224..525c74b 100644
--- a/yae.go
+++ b/yae.go
@@ -6,6 +6,7 @@ import (
"strings"
"time"
+ "github.com/charmbracelet/log"
"github.com/urfave/cli/v2"
)
@@ -40,8 +41,7 @@ func main() {
Copyright: fmt.Sprintf("Copyright (c) 2024-%s Fuwn", fmt.Sprint(time.Now().Year())),
ExitErrHandler: func(c *cli.Context, err error) {
if err != nil {
- fmt.Println(err)
- os.Exit(1)
+ log.Fatal(err.Error())
}
},
Suggest: true,
@@ -249,7 +249,6 @@ func main() {
},
},
}).Run(os.Args); err != nil {
- fmt.Println(err)
- os.Exit(1)
+ log.Fatal(err.Error())
}
}