From f8de6f01e72a50ec0f2f329ec4a0520a7e643425 Mon Sep 17 00:00:00 2001 From: mahdi Date: Fri, 3 Nov 2023 01:19:36 +0100 Subject: [PATCH] amend --- config/go.mod | 5 +++++ {src/config => config}/go.sum | 0 {src/config => config}/loader.go | 0 {src/config => config}/varpattern.go | 0 go.mod | 3 --- go.sum | 0 go.work | 9 ++++----- go.work.sum | 8 +------- src/config/go.mod | 5 ----- src/style/go.mod | 15 --------------- src/util/go.mod | 3 --- style/go.mod | 10 ++++++++++ {src/style => style}/go.sum | 3 +-- {src/style => style}/style.go | 4 +++- {src/sys => sys}/go.mod | 2 +- {src/sys => sys}/go.sum | 0 {src/sys => sys}/sys.go | 0 util/go.mod | 3 +++ {src/util => util}/util.go | 0 19 files changed, 28 insertions(+), 42 deletions(-) create mode 100644 config/go.mod rename {src/config => config}/go.sum (100%) rename {src/config => config}/loader.go (100%) rename {src/config => config}/varpattern.go (100%) delete mode 100644 go.mod delete mode 100644 go.sum delete mode 100644 src/config/go.mod delete mode 100644 src/style/go.mod delete mode 100644 src/util/go.mod create mode 100644 style/go.mod rename {src/style => style}/go.sum (82%) rename {src/style => style}/style.go (98%) rename {src/sys => sys}/go.mod (50%) rename {src/sys => sys}/go.sum (100%) rename {src/sys => sys}/sys.go (100%) create mode 100644 util/go.mod rename {src/util => util}/util.go (100%) diff --git a/config/go.mod b/config/go.mod new file mode 100644 index 0000000..4476044 --- /dev/null +++ b/config/go.mod @@ -0,0 +1,5 @@ +module gitea.meta-tech.academy/core/config + +go 1.20 + +require gopkg.in/yaml.v3 v3.0.1 diff --git a/src/config/go.sum b/config/go.sum similarity index 100% rename from src/config/go.sum rename to config/go.sum diff --git a/src/config/loader.go b/config/loader.go similarity index 100% rename from src/config/loader.go rename to config/loader.go diff --git a/src/config/varpattern.go b/config/varpattern.go similarity index 100% rename from src/config/varpattern.go rename to config/varpattern.go diff --git a/go.mod b/go.mod deleted file mode 100644 index 443c0a2..0000000 --- a/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module gitea.meta-tech.academy/go/core - -go 1.20 diff --git a/go.sum b/go.sum deleted file mode 100644 index e69de29..0000000 diff --git a/go.work b/go.work index add1084..95dca5c 100644 --- a/go.work +++ b/go.work @@ -1,9 +1,8 @@ go 1.20 use ( - . - ./src/config - ./src/style - ./src/sys - ./src/util + ./config + ./style + ./sys + ./util ) diff --git a/go.work.sum b/go.work.sum index d0cc927..8a453e6 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,9 +1,3 @@ -gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956/go.mod h1:q+p8vM+aQ36GVspuTTupRBNDUKrsXCccx4k3f7IKfx8= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= diff --git a/src/config/go.mod b/src/config/go.mod deleted file mode 100644 index d08f1ae..0000000 --- a/src/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/src/style/go.mod b/src/style/go.mod deleted file mode 100644 index 750bff4..0000000 --- a/src/style/go.mod +++ /dev/null @@ -1,15 +0,0 @@ -module gitea.meta-tech.academy/go/core/style - -go 1.20 - -require ( - gitea.meta-tech.academy/go/core/util v0.0.0 - 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 -) - -replace gitea.meta-tech.academy/go/core/util v0.0.0 => ../util diff --git a/src/util/go.mod b/src/util/go.mod deleted file mode 100644 index 093c216..0000000 --- a/src/util/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module gitea.meta-tech.academy/go/core/util - -go 1.20 diff --git a/style/go.mod b/style/go.mod new file mode 100644 index 0000000..dde5d97 --- /dev/null +++ b/style/go.mod @@ -0,0 +1,10 @@ +module gitea.meta-tech.academy/core/style + +go 1.20 + +require github.com/gookit/color v1.5.4 + +require ( + github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect + golang.org/x/sys v0.13.0 // indirect +) diff --git a/src/style/go.sum b/style/go.sum similarity index 82% rename from src/style/go.sum rename to style/go.sum index ce86143..08bc284 100644 --- a/src/style/go.sum +++ b/style/go.sum @@ -5,6 +5,5 @@ 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= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/src/style/style.go b/style/style.go similarity index 98% rename from src/style/style.go rename to style/style.go index 1ca33ab..e3a0506 100644 --- a/src/style/style.go +++ b/style/style.go @@ -3,7 +3,7 @@ package style import ( "fmt" "strings" - "gitea.meta-tech.academy/go/core/util" + "github.com/gookit/color" ) @@ -62,6 +62,8 @@ 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, "#") var s *color.RGBStyle switch len(c) { diff --git a/src/sys/go.mod b/sys/go.mod similarity index 50% rename from src/sys/go.mod rename to sys/go.mod index 68324f2..ba3d5d5 100644 --- a/src/sys/go.mod +++ b/sys/go.mod @@ -1,4 +1,4 @@ -module gitea.meta-tech.academy/go/core/sys +module gitea.meta-tech.academy/core/sys go 1.20 diff --git a/src/sys/go.sum b/sys/go.sum similarity index 100% rename from src/sys/go.sum rename to sys/go.sum diff --git a/src/sys/sys.go b/sys/sys.go similarity index 100% rename from src/sys/sys.go rename to sys/sys.go diff --git a/util/go.mod b/util/go.mod new file mode 100644 index 0000000..1d1823f --- /dev/null +++ b/util/go.mod @@ -0,0 +1,3 @@ +module gitea.meta-tech.academy/core/util + +go 1.20 diff --git a/src/util/util.go b/util/util.go similarity index 100% rename from src/util/util.go rename to util/util.go