diff --git a/config/loader.go b/config/loader.go index 1b77489..d32160a 100644 --- a/config/loader.go +++ b/config/loader.go @@ -7,6 +7,7 @@ import ( "strings" "gitea.meta-tech.academy/go/core/sys" + "gitea.meta-tech.academy/go/core/test" "gopkg.in/yaml.v3" ) @@ -14,6 +15,10 @@ func tutu() { sys.RunShellCmd("ls -la") } +func tata() { + test.Test() +} + type Cfg interface { GetVar() []VarConfig } diff --git a/go.work b/go.work index 14c53c9..d385f4a 100644 --- a/go.work +++ b/go.work @@ -2,6 +2,8 @@ go 1.20 use ( ./config + ./style ./sys + ./test ./util ) diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000..8a453e6 --- /dev/null +++ b/go.work.sum @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..4e4de0b --- /dev/null +++ b/style/go.mod @@ -0,0 +1,13 @@ +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/go.sum b/style/go.sum new file mode 100644 index 0000000..048065f --- /dev/null +++ b/style/go.sum @@ -0,0 +1,12 @@ +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= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +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= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/style/style.go b/style/style.go index 8901280..03ac6b0 100644 --- a/style/style.go +++ b/style/style.go @@ -62,9 +62,7 @@ func NewStyleByDef(def string) *Style { if len(d) > KEY_STYLE_OPTION { o = strings.Split(d[KEY_STYLE_OPTION], ",") } - azz := util.str2int("123") - fmt.Printf(azz) - util.prependToSliceStr(&c, "#") + util.PrependToSliceStr(&c, "#") var s *color.RGBStyle switch len(c) { case 1: @@ -74,7 +72,7 @@ func NewStyleByDef(def string) *Style { } for _, elm := range o { - s.AddOpts(color.Color(util.str2int(elm, 10, 0))) + s.AddOpts(color.Color(util.Str2int(elm, 10, 0))) } // s.Printf(" %-20s\n", d[KEY_STYLE_NAME]) return &Style{s, d[KEY_STYLE_NAME]} diff --git a/test/go.mod b/test/go.mod new file mode 100644 index 0000000..f35362c --- /dev/null +++ b/test/go.mod @@ -0,0 +1,3 @@ +module gitea.meta-tech.academy/go/core/test + +go 1.20 diff --git a/test/test.go b/test/test.go new file mode 100644 index 0000000..4ecb1e2 --- /dev/null +++ b/test/test.go @@ -0,0 +1,9 @@ +package test + +import ( + "fmt" +) + +func Test() { + fmt.Printf("test") +} diff --git a/util/util.go b/util/util.go index bad6353..d67c800 100644 --- a/util/util.go +++ b/util/util.go @@ -5,19 +5,19 @@ import ( "strings" ) -func prependToSliceStr(strs *[]string, prefix string) { +func PrependToSliceStr(strs *[]string, prefix string) { for i, elm := range *strs { (*strs)[i] = prefix + elm } } -func appendToSliceStr(strs *[]string, suffix string) { +func AppendToSliceStr(strs *[]string, suffix string) { for i, elm := range *strs { (*strs)[i] = elm + suffix } } -func str2int64(str string, base int, fallback int64) int64 { +func Str2int64(str string, base int, fallback int64) int64 { str = strings.TrimSuffix(str, "\n") num, err := strconv.ParseInt(str, base, 64) if err != nil { @@ -26,11 +26,11 @@ func str2int64(str string, base int, fallback int64) int64 { return num } -func str2int(str string, base int, fallback int) int { +func Str2int(str string, base int, fallback int) int { return int(str2int64(str, base, int64(fallback))) } -func castStrings2ints(strs *[]string) []int { +func CastStrings2ints(strs *[]string) []int { a := make([]int, len(*strs)) for i, elm := range *strs { var f int = str2int(elm, 10, 0)