diff --git a/go.work b/go.work index 73678c0..add1084 100644 --- a/go.work +++ b/go.work @@ -1,8 +1,9 @@ go 1.20 use ( - ./config - ./style - ./util - ./sys + . + ./src/config + ./src/style + ./src/sys + ./src/util ) diff --git a/config/go.mod b/src/config/go.mod similarity index 100% rename from config/go.mod rename to src/config/go.mod diff --git a/config/go.sum b/src/config/go.sum similarity index 100% rename from config/go.sum rename to src/config/go.sum diff --git a/config/loader.go b/src/config/loader.go similarity index 100% rename from config/loader.go rename to src/config/loader.go diff --git a/config/varpattern.go b/src/config/varpattern.go similarity index 100% rename from config/varpattern.go rename to src/config/varpattern.go diff --git a/style/go.mod b/src/style/go.mod similarity index 60% rename from style/go.mod rename to src/style/go.mod index aabb955..0548c10 100644 --- a/style/go.mod +++ b/src/style/go.mod @@ -2,7 +2,10 @@ module gitea.meta-tech.academy/go/core/style go 1.20 -require github.com/gookit/color v1.5.4 +require ( + gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956 + github.com/gookit/color v1.5.4 +) require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect diff --git a/style/go.sum b/src/style/go.sum similarity index 77% rename from style/go.sum rename to src/style/go.sum index ce86143..5cb28be 100644 --- a/style/go.sum +++ b/src/style/go.sum @@ -1,3 +1,5 @@ +gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956 h1:XxyPD/jBTPqrf2o1N3QRmw8fPgvP7G9Z9Ba3DgH/Uz0= +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 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= diff --git a/style/style.go b/src/style/style.go similarity index 98% rename from style/style.go rename to src/style/style.go index 7fce7cb..f29779f 100644 --- a/style/style.go +++ b/src/style/style.go @@ -3,7 +3,7 @@ package style import ( "fmt" "strings" - "gitea.meta-tech.academy/go/core/util" + "gitea.meta-tech.academy/go/core/util" "github.com/gookit/color" ) @@ -71,6 +71,7 @@ func NewStyleByDef(def string) *Style { s = color.HEXStyle(c[0], c[1]) } for _, elm := range o { + s.AddOpts(color.Color(util.str2int(elm, 10, 0))) } // s.Printf(" %-20s\n", d[KEY_STYLE_NAME]) diff --git a/sys/go.mod b/src/sys/go.mod similarity index 100% rename from sys/go.mod rename to src/sys/go.mod diff --git a/sys/go.sum b/src/sys/go.sum similarity index 100% rename from sys/go.sum rename to src/sys/go.sum diff --git a/sys/sys.go b/src/sys/sys.go similarity index 100% rename from sys/sys.go rename to src/sys/sys.go diff --git a/util/go.mod b/src/util/go.mod similarity index 100% rename from util/go.mod rename to src/util/go.mod diff --git a/util/util.go b/src/util/util.go similarity index 100% rename from util/util.go rename to src/util/util.go