From 7e8dd4ae9d1b1f20898270b9e85813f11bb9e3ee Mon Sep 17 00:00:00 2001 From: mahdi Date: Fri, 3 Nov 2023 03:10:55 +0100 Subject: [PATCH] amend module vs package --- config/go.mod | 5 ----- config/go.sum | 4 ---- go.mod | 11 +++++++++++ style/go.sum => go.sum | 9 +++++---- go.work | 8 -------- go.work.sum | 3 --- style/go.mod | 13 ------------- style/style.go | 33 +++++++++++++++++++++++---------- sys/go.mod | 5 ----- sys/go.sum | 2 -- util/go.mod | 3 --- 11 files changed, 39 insertions(+), 57 deletions(-) delete mode 100644 config/go.mod delete mode 100644 config/go.sum create mode 100644 go.mod rename style/go.sum => go.sum (62%) delete mode 100644 go.work delete mode 100644 go.work.sum delete mode 100644 style/go.mod delete mode 100644 sys/go.mod delete mode 100644 sys/go.sum delete mode 100644 util/go.mod diff --git a/config/go.mod b/config/go.mod deleted file mode 100644 index d08f1ae..0000000 --- a/config/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gitea.meta-tech.academy/go/core/config - -go 1.20 - -require gopkg.in/yaml.v3 v3.0.1 diff --git a/config/go.sum b/config/go.sum deleted file mode 100644 index a62c313..0000000 --- a/config/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -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= diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..8e486a4 --- /dev/null +++ b/go.mod @@ -0,0 +1,11 @@ +module gitea.meta-tech.academy/go/core + +go 1.20 + +require ( + github.com/gookit/color v1.5.4 + golang.org/x/sys v0.13.0 + gopkg.in/yaml.v3 v3.0.1 +) + +require github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect diff --git a/style/go.sum b/go.sum similarity index 62% rename from style/go.sum rename to go.sum index 048065f..f71ea80 100644 --- a/style/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -gitea.meta-tech.academy/go/core/util v0.0.0-20231103003446-3792c0f48134 h1:DTCBfyJ1HRBThmlYwFU6bLA2JV70inG1Yp/gug/pirk= -gitea.meta-tech.academy/go/core/util v0.0.0-20231103003446-3792c0f48134/go.mod h1:q+p8vM+aQ36GVspuTTupRBNDUKrsXCccx4k3f7IKfx8= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= @@ -7,6 +5,9 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.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= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +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= diff --git a/go.work b/go.work deleted file mode 100644 index 95dca5c..0000000 --- a/go.work +++ /dev/null @@ -1,8 +0,0 @@ -go 1.20 - -use ( - ./config - ./style - ./sys - ./util -) diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index 8a453e6..0000000 --- a/go.work.sum +++ /dev/null @@ -1,3 +0,0 @@ -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= diff --git a/style/go.mod b/style/go.mod deleted file mode 100644 index 4e4de0b..0000000 --- a/style/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module gitea.meta-tech.academy/go/core/style - -go 1.20 - -require ( - gitea.meta-tech.academy/go/core/util v0.0.0-20231103003446-3792c0f48134 - github.com/gookit/color v1.5.4 -) - -require ( - github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect - golang.org/x/sys v0.10.0 // indirect -) diff --git a/style/style.go b/style/style.go index 03ac6b0..b23374d 100644 --- a/style/style.go +++ b/style/style.go @@ -2,18 +2,12 @@ package style import ( "fmt" + "strconv" "strings" - "gitea.meta-tech.academy/go/core/util" + "github.com/gookit/color" ) -// Hello returns a greeting for the named person. -func Hello(name string) string { - // Return a greeting that embeds the name in a message. - message := fmt.Sprintf("Hi, %v. Welcome!", name) - return message -} - const KEY_STYLE_NAME = 0 const KEY_STYLE_COLOR = 1 const KEY_STYLE_OPTION = 2 @@ -62,7 +56,7 @@ func NewStyleByDef(def string) *Style { if len(d) > KEY_STYLE_OPTION { o = strings.Split(d[KEY_STYLE_OPTION], ",") } - util.PrependToSliceStr(&c, "#") + prependToSliceStr(&c, "#") var s *color.RGBStyle switch len(c) { case 1: @@ -72,7 +66,7 @@ func NewStyleByDef(def string) *Style { } for _, elm := range o { - s.AddOpts(color.Color(util.Str2int(elm, 10, 0))) + s.AddOpts(color.Color(str2int(elm, 10, 0))) } // s.Printf(" %-20s\n", d[KEY_STYLE_NAME]) return &Style{s, d[KEY_STYLE_NAME]} @@ -113,3 +107,22 @@ func (s *Styles) Keyval(key string, val string, names ...string) { sv.Apply(val), ) } + +func prependToSliceStr(strs *[]string, prefix string) { + for i, elm := range *strs { + (*strs)[i] = prefix + elm + } +} + +func str2int(str string, base int, fallback int) int { + return int(str2int64(str, base, int64(fallback))) +} + +func str2int64(str string, base int, fallback int64) int64 { + str = strings.TrimSuffix(str, "\n") + num, err := strconv.ParseInt(str, base, 64) + if err != nil { + num = fallback + } + return num +} diff --git a/sys/go.mod b/sys/go.mod deleted file mode 100644 index 68324f2..0000000 --- a/sys/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gitea.meta-tech.academy/go/core/sys - -go 1.20 - -require golang.org/x/sys v0.13.0 diff --git a/sys/go.sum b/sys/go.sum deleted file mode 100644 index d4673ec..0000000 --- a/sys/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/util/go.mod b/util/go.mod deleted file mode 100644 index 093c216..0000000 --- a/util/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module gitea.meta-tech.academy/go/core/util - -go 1.20