From 9ecb914202775a767de8648a118cc940fff46483 Mon Sep 17 00:00:00 2001 From: orangekame3 Date: Sat, 7 Oct 2023 22:43:43 +0900 Subject: [PATCH 1/3] update --- cmd/root.go | 17 ++++++++++------- go.mod | 3 ++- go.sum | 7 +++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index df6bc03..6cfcef1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -24,13 +24,14 @@ package cmd import ( "fmt" + "log" "os" - "os/exec" "strings" "time" "github.com/charmbracelet/lipgloss" "github.com/dmowcomber/go-clear" + "github.com/nsf/termbox-go" "github.com/spf13/cobra" ) @@ -95,12 +96,14 @@ func init() { } func getSize() (int, int) { - cmd := exec.Command("stty", "size") - cmd.Stdin = os.Stdin - out, _ := cmd.Output() - var rows, cols int - fmt.Sscan(string(out), &rows, &cols) - return rows, cols + err := termbox.Init() + if err != nil { + log.Fatalf("Error initializing termbox: %v", err) + } + defer termbox.Close() + + width, height := termbox.Size() + return height, width } func style(color string, lines []string) []string { diff --git a/go.mod b/go.mod index f6b7eaa..6957145 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.20 require ( github.com/charmbracelet/lipgloss v0.8.0 github.com/dmowcomber/go-clear v0.0.0-20170907212426-78a189996cad + github.com/nsf/termbox-go v1.1.1 github.com/spf13/cobra v1.7.0 ) @@ -19,5 +20,5 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - golang.org/x/sys v0.7.0 // indirect + golang.org/x/sys v0.10.0 // indirect ) diff --git a/go.sum b/go.sum index c6986f2..b12cd4b 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,7 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69 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.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= @@ -19,6 +20,8 @@ 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/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY= +github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= @@ -31,8 +34,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 3992a639eb4a8575f804f122b258ec1b1e711de4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 7 Oct 2023 13:44:18 +0000 Subject: [PATCH 2/3] [tagpr] prepare for the next release --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index 36e6719..22e1aeb 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -25,7 +25,7 @@ package cmd import "fmt" // Version is a version of paclear -const Version = "0.0.9" +const Version = "0.0.10" // SetVersionInfo sets version and date to rootCmd func SetVersionInfo(version, date string) { From ee984a090c93271295a736897dc71f4fa62956b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 7 Oct 2023 13:44:19 +0000 Subject: [PATCH 3/3] [tagpr] update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c5ebe..36cf3f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## [v0.0.10](https://github.com/orangekame3/paclear/compare/v0.0.9...v0.0.10) - 2023-10-07 + ## [v0.0.9](https://github.com/orangekame3/paclear/compare/v0.0.8...v0.0.9) - 2023-10-07 ## [v0.0.8](https://github.com/orangekame3/paclear/compare/v0.0.7...v0.0.8) - 2023-10-07