diff --git a/context.go b/context.go index 9015159..c603030 100644 --- a/context.go +++ b/context.go @@ -54,11 +54,7 @@ func (c *Context) Next() { } func (c *Context) prepare(ctx *Context) { - // Only parse multipart form if it hasn't been parsed already - // This prevents race conditions when multiple goroutines might access the same request - if ctx.Request.httpRequest.MultipartForm == nil { - ctx.Request.httpRequest.ParseMultipartForm(int64(app.Config.Request.MaxUploadFileSize)) - } + ctx.Request.httpRequest.ParseMultipartForm(int64(app.Config.Request.MaxUploadFileSize)) } func (c *Context) GetPathParam(key string) interface{} { diff --git a/core.go b/core.go index 3846432..ca8e747 100644 --- a/core.go +++ b/core.go @@ -6,7 +6,6 @@ package core import ( - "context" "embed" "fmt" "log" @@ -52,18 +51,12 @@ type configContainer struct { // App is a struct representing the main application container and its core components. type App struct { - t int // for tracking hooks (deprecated - maintained for backward compatibility) + t int // for tracking hooks chain *chain hooks *Hooks Config *configContainer } -// requestContext holds request-specific chain execution state -type requestContext struct { - chainIndex int - chainNodes []interface{} -} - // app is a global instance of the App structure used to manage application configuration and lifecycle. var app *App @@ -238,25 +231,10 @@ func (app *App) RegisterRoutes(routes []Route, router *httprouter.Router) *httpr // makeHTTPRouterHandlerFunc creates an httprouter.Handle that handles HTTP requests with the specified controller and hooks. func (app *App) makeHTTPRouterHandlerFunc(h Controller, ms []Hook) httprouter.Handle { return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { - // Create request-specific chain state - reqCtx := &requestContext{ - chainIndex: 0, - } - - // Prepare the chain nodes for this request - mw := app.hooks.GetHooks() - for _, v := range mw { - reqCtx.chainNodes = append(reqCtx.chainNodes, v) - } - rhs := app.combHandlers(h, ms) - for _, v := range rhs { - reqCtx.chainNodes = append(reqCtx.chainNodes, v) - } - - // Store chain state in request context + ctx := &Context{ Request: &Request{ - httpRequest: r.WithContext(context.WithValue(r.Context(), "goffeeChain", reqCtx)), + httpRequest: r, httpPathParams: ps, }, Response: &Response{ @@ -279,20 +257,15 @@ func (app *App) makeHTTPRouterHandlerFunc(h Controller, ms []Hook) httprouter.Ha } ctx.prepare(ctx) - - // Execute the first handler in the chain - if len(reqCtx.chainNodes) > 0 { - n := reqCtx.chainNodes[0] - if f, ok := n.(Hook); ok { - f(ctx) - } else if ff, ok := n.(Controller); ok { - ff(ctx) - } - } + rhs := app.combHandlers(h, ms) + app.prepareChain(rhs) + app.t = 0 + app.chain.execute(ctx) for _, header := range ctx.Response.headers { w.Header().Add(header.key, header.val) } + logger.CloseLogsFile() var ct string if ctx.Response.overrideContentType != "" { ct = ctx.Response.overrideContentType @@ -333,7 +306,7 @@ func (n notFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotFound) res := "{\"message\": \"Not Found\"}" loggr.Error("Not Found") - //loggr.Error(debug.Stack()) + loggr.Error(debug.Stack()) w.Header().Add(CONTENT_TYPE, CONTENT_TYPE_JSON) w.Write([]byte(res)) } @@ -343,7 +316,7 @@ func (n methodNotAllowed) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusMethodNotAllowed) res := "{\"message\": \"Method not allowed\"}" loggr.Error("Method not allowed") - //loggr.Error(debug.Stack()) + loggr.Error(debug.Stack()) w.Header().Add(CONTENT_TYPE, CONTENT_TYPE_JSON) w.Write([]byte(res)) } @@ -371,7 +344,7 @@ var panicHandler = func(w http.ResponseWriter, r *http.Request, e interface{}) { shrtMsg := fmt.Sprintf("%v", e) loggr.Error(shrtMsg) fmt.Println(shrtMsg) - //loggr.Error(string(debug.Stack())) + loggr.Error(string(debug.Stack())) var res string if env.GetVarOtherwiseDefault("APP_ENV", "local") == PRODUCTION { res = "{\"message\": \"internal error\"}" @@ -390,30 +363,16 @@ func UseHook(mw Hook) { // Next advances to the next middleware or controller in the chain and invokes it with the given context if available. func (app *App) Next(c *Context) { - // Get request-specific chain state from context - if reqCtx, ok := c.Request.httpRequest.Context().Value("goffeeChain").(*requestContext); ok { - reqCtx.chainIndex++ - if reqCtx.chainIndex < len(reqCtx.chainNodes) { - n := reqCtx.chainNodes[reqCtx.chainIndex] - if f, ok := n.(Hook); ok { - f(c) - } else if ff, ok := n.(Controller); ok { - ff(c) - } - } - } else { - // Fallback to old behavior (not thread-safe) - app.t = app.t + 1 - n := app.chain.getByIndex(app.t) - if n != nil { - f, ok := n.(Hook) + app.t = app.t + 1 + n := app.chain.getByIndex(app.t) + if n != nil { + f, ok := n.(Hook) + if ok { + f(c) + } else { + ff, ok := n.(Controller) if ok { - f(c) - } else { - ff, ok := n.(Controller) - if ok { - ff(c) - } + ff(c) } } } @@ -451,17 +410,6 @@ func (app *App) prepareChain(hs []interface{}) { } } -// prepareRequestChain prepares a request-specific chain to avoid race conditions -func (app *App) prepareRequestChain(requestChain *chain, hs []interface{}) { - mw := app.hooks.GetHooks() - for _, v := range mw { - requestChain.nodes = append(requestChain.nodes, v) - } - for _, v := range hs { - requestChain.nodes = append(requestChain.nodes, v) - } -} - // execute executes the first node in the chain, invoking it as either a Hook or Controller if applicable. func (cn *chain) execute(ctx *Context) { i := cn.getByIndex(0) diff --git a/go.mod b/go.mod index 793079f..9a967b5 100644 --- a/go.mod +++ b/go.mod @@ -4,61 +4,57 @@ replace git.smarteching.com/goffee/core/logger => ./logger replace git.smarteching.com/goffee/core/env => ./env -go 1.25.0 +go 1.24.1 require ( git.smarteching.com/zeni/go-chart/v2 v2.1.4 - git.smarteching.com/zeni/go-charts/v2 v2.6.11 github.com/brianvoe/gofakeit/v6 v6.21.0 - github.com/golang-jwt/jwt/v5 v5.3.1 + github.com/golang-jwt/jwt/v5 v5.0.0 github.com/google/uuid v1.6.0 github.com/harranali/mailing v1.2.0 - github.com/hibiken/asynq v0.26.0 github.com/joho/godotenv v1.5.1 github.com/julienschmidt/httprouter v1.3.0 - github.com/redis/go-redis/v9 v9.19.0 - golang.org/x/crypto v0.50.0 - gorm.io/driver/mysql v1.6.0 - gorm.io/driver/postgres v1.6.0 - gorm.io/driver/sqlite v1.6.0 - gorm.io/gorm v1.31.1 + github.com/redis/go-redis/v9 v9.7.0 + golang.org/x/crypto v0.11.0 + gorm.io/driver/mysql v1.5.1 + gorm.io/driver/postgres v1.5.2 + gorm.io/driver/sqlite v1.5.2 + gorm.io/gorm v1.25.2 ) require ( - filippo.io/edwards25519 v1.2.0 // indirect + git.smarteching.com/zeni/go-charts/v2 v2.6.11 // indirect github.com/SparkPost/gosparkpost v0.2.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/go-chi/chi/v5 v5.2.5 // indirect - github.com/go-sql-driver/mysql v1.10.0 // indirect + github.com/go-chi/chi/v5 v5.0.8 // indirect + github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect + github.com/hibiken/asynq v0.25.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.9.2 // indirect - github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/mailgun/errors v0.5.0 // indirect - github.com/mailgun/mailgun-go/v4 v4.23.0 // indirect - github.com/mattn/go-sqlite3 v1.14.44 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgx/v5 v5.3.1 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/mailgun/mailgun-go/v4 v4.10.0 // indirect + github.com/mattn/go-sqlite3 v1.14.17 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sendgrid/rest v2.6.9+incompatible // indirect - github.com/sendgrid/sendgrid-go v3.16.1+incompatible // indirect - github.com/spf13/cast v1.10.0 // indirect - go.uber.org/atomic v1.11.0 // indirect - golang.org/x/image v0.39.0 // indirect - golang.org/x/net v0.53.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.43.0 // indirect - golang.org/x/text v0.36.0 // indirect - golang.org/x/time v0.15.0 // indirect - google.golang.org/protobuf v1.36.11 // indirect + github.com/sendgrid/sendgrid-go v3.12.0+incompatible // indirect + github.com/spf13/cast v1.7.0 // indirect + golang.org/x/image v0.21.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.19.0 // indirect + golang.org/x/time v0.8.0 // indirect + google.golang.org/protobuf v1.35.2 // indirect ) require ( - github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/go-ozzo/ozzo-validation v3.6.0+incompatible github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect diff --git a/go.sum b/go.sum index 441135c..9c1a556 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= -filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= git.smarteching.com/zeni/go-chart/v2 v2.1.4 h1:pF06+F6eqJLIG8uMiTVPR5TygPGMjM/FHMzTxmu5V/Q= git.smarteching.com/zeni/go-chart/v2 v2.1.4/go.mod h1:b3ueW9h3pGGXyhkormZAvilHaG4+mQti+bMNPdQBeOQ= git.smarteching.com/zeni/go-charts/v2 v2.6.11 h1:9udzlv3uxGXszpplfkL5IaTUrgkNj++KwhbaN1vVEqI= @@ -10,50 +8,54 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/brianvoe/gofakeit/v6 v6.21.0 h1:tNkm9yxEbpuPK8Bx39tT4sSc5i9SUGiciLdNix+VDQY= github.com/brianvoe/gofakeit/v6 v6.21.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= -github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= -github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= -github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= -github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= +github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= +github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= +github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/buger/jsonparser v1.0.0/go.mod h1:tgcrVJ81GPSF0mz+0nu1Xaz0fazGPrmmJfJtxjbHhUQ= github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8= -github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= -github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= -github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= -github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0= +github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE= github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= -github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= -github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= -github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= -github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= -github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/harranali/mailing v1.2.0 h1:ihIyJwB8hyRVcdk+v465wk1PHMrSrgJqo/kMd+gZClY= github.com/harranali/mailing v1.2.0/go.mod h1:4a5N3yG98pZKluMpmcYlTtll7bisvOfGQEMIng3VQk4= -github.com/hibiken/asynq v0.26.0 h1:1Zxr92MlDnb1Zt/QR5g2vSCqUS03i95lUfqx5X7/wrw= -github.com/hibiken/asynq v0.26.0/go.mod h1:Qk4e57bTnWDoyJ67VkchuV6VzSM9IQW2nPvAGuDyw58= +github.com/hibiken/asynq v0.25.1 h1:phj028N0nm15n8O2ims+IvJ2gz4k2auvermngh9JhTw= +github.com/hibiken/asynq v0.25.1/go.mod h1:pazWNOLBu0FEynQRBvHA26qdIKRSmfdIfUm4HdsLmXg= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw= -github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= -github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= -github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= +github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jhillyerd/enmime v0.8.0/go.mod h1:MBHs3ugk03NGjMM6PuRynlKf+HA5eSillZ+TRCm73AE= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -62,94 +64,77 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= -github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/mailgun/errors v0.5.0 h1:pLQo8uhAdORsjN69mGixSr0pGs46z/BW/FQXd8HG1VM= -github.com/mailgun/errors v0.5.0/go.mod h1:+2nrgY77E0vDkG4ErehpcpbSkMLkseJzKbrva89WeSs= -github.com/mailgun/mailgun-go/v4 v4.23.0 h1:jPEMJzzin2s7lvehcfv/0UkyBu18GvcURPr2+xtZRbk= -github.com/mailgun/mailgun-go/v4 v4.23.0/go.mod h1:imTtizoFtpfZqPqGP8vltVBB6q9yWcv6llBhfFeElZU= +github.com/mailgun/mailgun-go/v4 v4.10.0 h1:e5LVsxpqjOYRyaOWifrJORoLQZTYDP+g4ljfmf9G2zE= +github.com/mailgun/mailgun-go/v4 v4.10.0/go.mod h1:L9s941Lgk7iB3TgywTPz074pK2Ekkg4kgbnAaAyJ2z8= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8= -github.com/mattn/go-sqlite3 v1.14.44/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ= +github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= +github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k= -github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.0.5 h1:CuQcn5HIEeK7BgElubPP8CGtE0KakrnbBSTLjathl5o= +github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= +github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= +github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU= github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0= github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= -github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1GjJohAA0p6hVEaDtHWWs= -github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= -github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= +github.com/sendgrid/sendgrid-go v3.12.0+incompatible h1:/N2vx18Fg1KmQOh6zESc5FJB8pYwt5QFBDflYPh1KVg= +github.com/sendgrid/sendgrid-go v3.12.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= +github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= -github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= -golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= -golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww= -golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s= +golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= -golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= -golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= -golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= -golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= -golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= -google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= -gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= -gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw= +gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o= +gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0= +gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8= +gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc= +gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4= +gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho= +gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= diff --git a/graph.go b/graph.go index 1677229..1ca21b8 100644 --- a/graph.go +++ b/graph.go @@ -11,7 +11,6 @@ import ( "strings" "git.smarteching.com/zeni/go-chart/v2" - "git.smarteching.com/zeni/go-charts/v2" "github.com/julienschmidt/httprouter" ) @@ -45,7 +44,7 @@ func Graph(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { qtyl := len(labels) qtyv := len(values) - // check qty and equal values from url + // cjeck qty and equal values from url if qtyl < 2 { fmt.Fprintf(w, "Missing captions in pie") return @@ -86,9 +85,9 @@ func Graph(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { qtyl := len(labels) qtyv := len(values) - // check qty and equal values from url + // cjeck qty and equal values from url if qtyl < 2 { - fmt.Fprintf(w, "Missing captions in bar") + fmt.Fprintf(w, "Missing captions in pie") return } if qtyv != qtyl { @@ -117,83 +116,6 @@ func Graph(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { fmt.Printf("Error rendering pie chart: %v\n", err) } - // case multiple graph bar - case "mbar": - - queryValues := r.URL.Query() - labels := strings.Split(queryValues.Get("l"), "|") - values := strings.Split(queryValues.Get("v"), "|") - options := strings.Split(queryValues.Get("o"), "|") - - qtyl := len(labels) - qtyv := len(values) - qtyo := len(options) - - // check qty and equal values from url - if qtyl < 2 { - fmt.Fprintf(w, "Missing captions in bar") - return - } - if qtyv < 2 { - fmt.Fprintf(w, "Missing values in bar") - return - } - if qtyo < 2 { - fmt.Fprintf(w, "Missing options in bar") - return - } - - valuest := [][]float64{ - { - 2.0, - 4.9, - 7.0, - 23.2, - 25.6, - 76.7, - 135.6, - 162.2, - 32.6, - }, - { - 2.6, - 5.9, - 9.0, - 26.4, - 28.7, - 70.7, - 175.6, - 182.2, - 48.7, - }, - } - p, err := charts.BarRender( - valuest, - charts.XAxisDataOptionFunc([]string{ - "Apr", - "May", - "Jun", - "Jul", - "Aug", - "Sep", - "Oct", - "Nov", - "Dec", - }), - charts.LegendLabelsOptionFunc(labels, charts.PositionRight), - ) - if err != nil { - panic(err) - } - - buf, err := p.Bytes() - - w.Header().Set("Content-Type", "image/png") - w.Write(buf) - if err != nil { - fmt.Printf("Error rendering pie chart: %v\n", err) - } - default: fmt.Fprintf(w, "Unknown graph %s!\n", kindg) } diff --git a/logger/logger.go b/logger/logger.go index fd56eba..4746c9f 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -1,4 +1,4 @@ -// Copyright (c) 2026 Zeni Kim +// Copyright 2021 Harran Ali . All rights reserved. // Use of this source code is governed by MIT-style // license that can be found in the LICENSE file. @@ -8,68 +8,16 @@ import ( "io" "log" "os" - "strings" ) // logs file var logsFile *os.File -// ANSI color codes for terminal output -const ( - colorReset = "\033[0m" - colorRed = "\033[31m" - colorYellow = "\033[33m" - colorBlue = "\033[34m" - colorCyan = "\033[36m" -) - -// Level represents a log severity level. -type Level int - -const ( - DEBUG Level = iota - INFO - WARNING - ERROR -) - -// String returns the string representation of a log level. -func (l Level) String() string { - switch l { - case DEBUG: - return "debug" - case INFO: - return "info" - case WARNING: - return "warning" - case ERROR: - return "error" - default: - return "unknown" - } -} - -// coloredWriter wraps an io.Writer and replaces plain log prefixes with ANSI-colored ones -// in the output stream. The original bytes pass through unmodified to any additional writers. -type coloredWriter struct { - writer io.Writer - plain string - colored string -} - -func (w *coloredWriter) Write(p []byte) (n int, err error) { - // Replace the plain prefix with the colored version in the output - colored := strings.Replace(string(p), w.plain, w.colored, 1) - return w.writer.Write([]byte(colored)) -} - type Logger struct { - minLevel Level infoLogger *log.Logger warningLogger *log.Logger errorLogger *log.Logger debugLogger *log.Logger - file *os.File } var l *Logger @@ -92,36 +40,9 @@ func (f LogFileDriver) GetTarget() interface{} { return f.FilePath } -// levelPrefixes returns the plain and colored (with ANSI escapes) prefix strings for a given level. -func levelPrefixes(level Level) (plain, colored string) { - switch level { - case INFO: - return "info: ", colorBlue + "INFO" + colorReset + ": " - case DEBUG: - return "debug: ", colorCyan + "DEBUG" + colorReset + ": " - case WARNING: - return "warning: ", colorYellow + "WARNING" + colorReset + ": " - case ERROR: - return "error: ", colorRed + "ERROR" + colorReset + ": " - default: - return "info: ", "INFO: " - } -} - -// NewLogger creates a new Logger with the given driver and a minimum level of DEBUG (all levels logged). func NewLogger(driver LogsDriver) *Logger { - stdoutEnabled := os.Getenv("LOG_STDOUT_ENABLE") == "true" - return NewLoggerWithStdout(driver, DEBUG, stdoutEnabled) -} - -// NewLoggerWithStdout creates a new Logger with the given driver, minimum log level, -// and optionally writes to stdout in addition to the target file. -// When stdoutEnabled is true, log messages are written to both the target and stdout. -// ANSI color codes are applied to log prefixes in terminal output only. -func NewLoggerWithStdout(driver LogsDriver, minLevel Level, stdoutEnabled bool) *Logger { if driver.GetTarget() == nil { l = &Logger{ - minLevel: minLevel, infoLogger: log.New(io.Discard, "info: ", log.LstdFlags), warningLogger: log.New(io.Discard, "warning: ", log.LstdFlags), errorLogger: log.New(io.Discard, "error: ", log.LstdFlags), @@ -133,103 +54,41 @@ func NewLoggerWithStdout(driver LogsDriver, minLevel Level, stdoutEnabled bool) if !ok { panic("something wrong with the file path") } - var err error - logsFile, err = os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644) + logsFile, err := os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644) if err != nil { panic(err) } - - if stdoutEnabled { - // Build each logger with a MultiWriter: the file gets the original plain output, - // stdout gets the output with ANSI-colored prefixes. - infoPlain, infoColored := levelPrefixes(INFO) - debugPlain, debugColored := levelPrefixes(DEBUG) - warnPlain, warnColored := levelPrefixes(WARNING) - errPlain, errColored := levelPrefixes(ERROR) - - l = &Logger{ - minLevel: minLevel, - infoLogger: log.New( - io.MultiWriter(logsFile, &coloredWriter{writer: os.Stdout, plain: infoPlain, colored: infoColored}), - infoPlain, log.LstdFlags, - ), - warningLogger: log.New( - io.MultiWriter(logsFile, &coloredWriter{writer: os.Stdout, plain: warnPlain, colored: warnColored}), - warnPlain, log.LstdFlags, - ), - errorLogger: log.New( - io.MultiWriter(logsFile, &coloredWriter{writer: os.Stdout, plain: errPlain, colored: errColored}), - errPlain, log.LstdFlags, - ), - debugLogger: log.New( - io.MultiWriter(logsFile, &coloredWriter{writer: os.Stdout, plain: debugPlain, colored: debugColored}), - debugPlain, log.LstdFlags, - ), - file: logsFile, - } - } else { - // No stdout: all output goes to file with plain prefixes - l = &Logger{ - minLevel: minLevel, - infoLogger: log.New(logsFile, "info: ", log.LstdFlags), - warningLogger: log.New(logsFile, "warning: ", log.LstdFlags), - errorLogger: log.New(logsFile, "error: ", log.LstdFlags), - debugLogger: log.New(logsFile, "debug: ", log.LstdFlags), - file: logsFile, - } + l = &Logger{ + infoLogger: log.New(logsFile, "info: ", log.LstdFlags), + warningLogger: log.New(logsFile, "warning: ", log.LstdFlags), + errorLogger: log.New(logsFile, "error: ", log.LstdFlags), + debugLogger: log.New(logsFile, "debug: ", log.LstdFlags), } return l } -// NewLoggerWithLevel creates a new Logger with the given driver and minimum log level. -// Messages below the minimum level will be discarded. Stdout output is disabled by default. -func NewLoggerWithLevel(driver LogsDriver, minLevel Level) *Logger { - stdoutEnabled := os.Getenv("LOG_STDOUT_ENABLE") == "true" - return NewLoggerWithStdout(driver, minLevel, stdoutEnabled) -} - -// SetLevel sets the minimum log level for the logger. -// Messages below this level will be discarded. -func (l *Logger) SetLevel(level Level) { - l.minLevel = level -} - -// GetLevel returns the current minimum log level. -func (l *Logger) GetLevel() Level { - return l.minLevel -} - func ResolveLogger() *Logger { return l } func (l *Logger) Info(msg interface{}) { - if l.minLevel <= INFO { - l.infoLogger.Println(msg) - } + l.infoLogger.Println(msg) } func (l *Logger) Debug(msg interface{}) { - if l.minLevel <= DEBUG { - l.debugLogger.Println(msg) - } + l.debugLogger.Println(msg) } func (l *Logger) Warning(msg interface{}) { - if l.minLevel <= WARNING { - l.warningLogger.Println(msg) - } + l.warningLogger.Println(msg) } func (l *Logger) Error(msg interface{}) { - if l.minLevel <= ERROR { - l.errorLogger.Println(msg) - } + l.errorLogger.Println(msg) } -func (l *Logger) Close() error { - if l.file != nil { - return l.file.Close() +func CloseLogsFile() { + if logsFile != nil { + defer logsFile.Close() } - return nil } diff --git a/logger/logger_test.go b/logger/logger_test.go index 46760ca..f82e8a1 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -61,7 +61,7 @@ func TestInfo(t *testing.T) { t.Error("error testing info") } t.Cleanup(func() { - l.Close() + CloseLogsFile() }) } @@ -84,7 +84,7 @@ func TestWarning(t *testing.T) { t.Error("failed testing warning") } t.Cleanup(func() { - l.Close() + CloseLogsFile() }) } @@ -106,7 +106,7 @@ func TestDebug(t *testing.T) { t.Error("error testing debug") } t.Cleanup(func() { - l.Close() + CloseLogsFile() }) } @@ -128,173 +128,6 @@ func TestError(t *testing.T) { t.Error("failed testing error") } t.Cleanup(func() { - l.Close() + CloseLogsFile() }) } - -func TestLevelFiltering(t *testing.T) { - t.Run("NewLoggerWithLevel_DEBUG", func(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLoggerWithLevel(&LogFileDriver{FilePath: path}, DEBUG) - l.Debug("debug-msg") - l.Info("info-msg") - l.Warning("warn-msg") - l.Error("err-msg") - l.Close() - - b, _ := os.ReadFile(path) - content := string(b) - if !strings.Contains(content, "debug-msg") { - t.Error("expected debug-msg to be logged at DEBUG level") - } - if !strings.Contains(content, "info-msg") { - t.Error("expected info-msg to be logged at DEBUG level") - } - if !strings.Contains(content, "warn-msg") { - t.Error("expected warn-msg to be logged at DEBUG level") - } - if !strings.Contains(content, "err-msg") { - t.Error("expected err-msg to be logged at DEBUG level") - } - }) - - t.Run("NewLoggerWithLevel_INFO", func(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLoggerWithLevel(&LogFileDriver{FilePath: path}, INFO) - l.Debug("debug-msg") - l.Info("info-msg") - l.Warning("warn-msg") - l.Error("err-msg") - l.Close() - - b, _ := os.ReadFile(path) - content := string(b) - if strings.Contains(content, "debug-msg") { - t.Error("debug-msg should NOT be logged at INFO minimum level") - } - if !strings.Contains(content, "info-msg") { - t.Error("expected info-msg to be logged at INFO level") - } - if !strings.Contains(content, "warn-msg") { - t.Error("expected warn-msg to be logged at INFO level") - } - if !strings.Contains(content, "err-msg") { - t.Error("expected err-msg to be logged at INFO level") - } - }) - - t.Run("NewLoggerWithLevel_WARNING", func(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLoggerWithLevel(&LogFileDriver{FilePath: path}, WARNING) - l.Debug("debug-msg") - l.Info("info-msg") - l.Warning("warn-msg") - l.Error("err-msg") - l.Close() - - b, _ := os.ReadFile(path) - content := string(b) - if strings.Contains(content, "debug-msg") { - t.Error("debug-msg should NOT be logged at WARNING minimum level") - } - if strings.Contains(content, "info-msg") { - t.Error("info-msg should NOT be logged at WARNING minimum level") - } - if !strings.Contains(content, "warn-msg") { - t.Error("expected warn-msg to be logged at WARNING level") - } - if !strings.Contains(content, "err-msg") { - t.Error("expected err-msg to be logged at WARNING level") - } - }) - - t.Run("NewLoggerWithLevel_ERROR", func(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLoggerWithLevel(&LogFileDriver{FilePath: path}, ERROR) - l.Debug("debug-msg") - l.Info("info-msg") - l.Warning("warn-msg") - l.Error("err-msg") - l.Close() - - b, _ := os.ReadFile(path) - content := string(b) - if strings.Contains(content, "debug-msg") { - t.Error("debug-msg should NOT be logged at ERROR minimum level") - } - if strings.Contains(content, "info-msg") { - t.Error("info-msg should NOT be logged at ERROR minimum level") - } - if strings.Contains(content, "warn-msg") { - t.Error("warn-msg should NOT be logged at ERROR minimum level") - } - if !strings.Contains(content, "err-msg") { - t.Error("expected err-msg to be logged at ERROR level") - } - }) - - t.Run("SetLevel_dynamically", func(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLogger(&LogFileDriver{FilePath: path}) - - // Default is DEBUG, so debug messages are logged - l.Debug("debug-msg-before") - l.SetLevel(WARNING) - l.Debug("debug-msg-after") - l.Info("info-msg-after") - l.Warning("warn-msg-after") - l.Error("err-msg-after") - l.Close() - - b, _ := os.ReadFile(path) - content := string(b) - if !strings.Contains(content, "debug-msg-before") { - t.Error("expected debug-msg-before to be logged before level change") - } - if strings.Contains(content, "debug-msg-after") { - t.Error("debug-msg-after should NOT be logged after setting level to WARNING") - } - if strings.Contains(content, "info-msg-after") { - t.Error("info-msg-after should NOT be logged after setting level to WARNING") - } - if !strings.Contains(content, "warn-msg-after") { - t.Error("expected warn-msg-after to be logged at WARNING level") - } - if !strings.Contains(content, "err-msg-after") { - t.Error("expected err-msg-after to be logged at WARNING level") - } - }) -} - -func TestLevelString(t *testing.T) { - tests := []struct { - level Level - want string - }{ - {DEBUG, "debug"}, - {INFO, "info"}, - {WARNING, "warning"}, - {ERROR, "error"}, - {Level(99), "unknown"}, - } - for _, tt := range tests { - if got := tt.level.String(); got != tt.want { - t.Errorf("Level(%d).String() = %q, want %q", tt.level, got, tt.want) - } - } -} - -func TestGetLevel(t *testing.T) { - path := filepath.Join(t.TempDir(), uuid.NewString()) - l := NewLoggerWithLevel(&LogFileDriver{FilePath: path}, WARNING) - defer l.Close() - - if l.GetLevel() != WARNING { - t.Errorf("GetLevel() = %d, want %d", l.GetLevel(), WARNING) - } - - l.SetLevel(INFO) - if l.GetLevel() != INFO { - t.Errorf("GetLevel() after SetLevel(INFO) = %d, want %d", l.GetLevel(), INFO) - } -} diff --git a/templates.go b/templates.go index 4ee0050..38ef4f2 100644 --- a/templates.go +++ b/templates.go @@ -1,4 +1,4 @@ -// Copyright (c) 2026 Zeni Kim +// Copyright (c) 2024 Zeni Kim // Use of this source code is governed by MIT-style // license that can be found in the LICENSE file. @@ -6,337 +6,15 @@ package core import ( "embed" - "fmt" "html/template" "io/fs" - "math" - "reflect" "strings" - "time" - "unicode" - "golang.org/x/text/language" - "golang.org/x/text/message" ) var tmpl *template.Template = nil -// ───────────────────────────────────────────── -// Struct helpers -// ───────────────────────────────────────────── - -// hasField checks if a struct has a given field name. -// It can be used inside Go html/templates like: -// -// {{if hasField . "FieldA"}}{{.FieldA}}{{end}} -func hasField(v interface{}, name string) bool { - rv := reflect.ValueOf(v) - if rv.Kind() == reflect.Ptr { - rv = rv.Elem() - } - if rv.Kind() != reflect.Struct { - return false - } - return rv.FieldByName(name).IsValid() -} - -// ───────────────────────────────────────────── -// String helpers -// ───────────────────────────────────────────── - -// capitalize uppercases the first letter of a string and lowercases the rest. -// -// {{capitalize "hello world"}} → "Hello world" -func capitalize(s string) string { - if s == "" { - return "" - } - runes := []rune(s) - runes[0] = unicode.ToUpper(runes[0]) - for i := 1; i < len(runes); i++ { - runes[i] = unicode.ToLower(runes[i]) - } - return string(runes) -} - -// prepend adds a prefix string to the beginning of s. -// -// {{prepend "World" "Hello, "}} → "Hello, World" -func prepend(s, prefix string) string { - return prefix + s -} - -// strAppend adds a suffix string to the end of s. -// Named strAppend to avoid collision with the builtin append keyword. -// -// {{strAppend "Hello" "!"}} → "Hello!" -func strAppend(s, suffix string) string { - return s + suffix -} - -// split divides s into a slice of substrings separated by sep. -// Useful when combined with range in templates. -// -// {{range split .Tags ","}}...{{end}} -func split(s, sep string) []string { - return strings.Split(s, sep) -} - -// truncate cuts s to at most n characters. Designed for pipeline use: -// {{.Title | truncate 30}} -func truncate(n int, s string) string { - runes := []rune(s) - if len(runes) <= n { - return s - } - return string(runes[:n]) + "…" -} - -// ───────────────────────────────────────────── -// Number helpers -// ───────────────────────────────────────────── - -// fmtNumber formats an integer or float with thousands separators -// using the English locale (e.g. 1000000 → "1,000,000"). -// -// {{fmtNumber .Price}} -func fmtNumber(v interface{}) string { - p := message.NewPrinter(language.English) - switch n := v.(type) { - case int: - return p.Sprintf("%d", n) - case int64: - return p.Sprintf("%d", n) - case float64: - // trim unnecessary trailing zeros - formatted := p.Sprintf("%.2f", n) - return formatted - case float32: - return p.Sprintf("%.2f", n) - default: - return fmt.Sprintf("%v", v) - } -} - -// ───────────────────────────────────────────── -// Date & time helpers -// ───────────────────────────────────────────── - -// fmtDate formats a time.Time value using a named layout or a custom Go layout string. -// Named layouts: "short" → "02 Jan 2006", "long" → "02 January 2006", -// "iso" → "2006-01-02", "datetime" → "02 Jan 2006 15:04". -// Any other string is used directly as a Go time layout. -// -// {{fmtDate .PublishedAt "short"}} -// {{fmtDate .CreatedAt "02/01/2006"}} -func fmtDate(t time.Time, layout string) string { - switch layout { - case "short": - return t.Format("02 Jan 2006") - case "long": - return t.Format("02 January 2006") - case "iso": - return t.Format("2006-01-02") - case "datetime": - return t.Format("02 Jan 2006 15:04") - default: - return t.Format(layout) - } -} - -// timeAgo returns a human-readable relative time string from now. -// -// {{timeAgo .PublishedAt}} → "3 hours ago", "2 days ago", "just now" -func timeAgo(t time.Time) string { - diff := time.Since(t) - - switch { - case diff < time.Minute: - return "just now" - case diff < time.Hour: - m := int(math.Round(diff.Minutes())) - return plural(m, "minute") + " ago" - case diff < 24*time.Hour: - h := int(math.Round(diff.Hours())) - return plural(h, "hour") + " ago" - case diff < 7*24*time.Hour: - d := int(math.Round(diff.Hours() / 24)) - return plural(d, "day") + " ago" - case diff < 30*24*time.Hour: - w := int(math.Round(diff.Hours() / 24 / 7)) - return plural(w, "week") + " ago" - case diff < 365*24*time.Hour: - mo := int(math.Round(diff.Hours() / 24 / 30)) - return plural(mo, "month") + " ago" - default: - y := int(math.Round(diff.Hours() / 24 / 365)) - return plural(y, "year") + " ago" - } -} - -// plural is an internal helper that returns "1 item" or "N items". -func plural(n int, unit string) string { - if n == 1 { - return fmt.Sprintf("%d %s", n, unit) - } - return fmt.Sprintf("%d %ss", n, unit) -} - -// ───────────────────────────────────────────── -// Collection helpers -// ───────────────────────────────────────────── - -// first returns the first element of a slice, or nil if empty. -// -// {{with first .Items}}{{.Name}}{{end}} -func first(slice interface{}) interface{} { - rv := reflect.ValueOf(slice) - if rv.Kind() != reflect.Slice || rv.Len() == 0 { - return nil - } - return rv.Index(0).Interface() -} - -// last returns the last element of a slice, or nil if empty. -// -// {{with last .Items}}{{.Name}}{{end}} -func last(slice interface{}) interface{} { - rv := reflect.ValueOf(slice) - if rv.Kind() != reflect.Slice || rv.Len() == 0 { - return nil - } - return rv.Index(rv.Len() - 1).Interface() -} - -// sliceOf returns a sub-range of a slice from index start (inclusive) to end (exclusive). -// Named sliceOf to avoid collision with the builtin slice expression. -// -// {{range sliceOf .Items 0 3}}...{{end}} -func sliceOf(slice interface{}, start, end int) interface{} { - rv := reflect.ValueOf(slice) - if rv.Kind() != reflect.Slice { - return nil - } - if start < 0 { - start = 0 - } - if end > rv.Len() { - end = rv.Len() - } - return rv.Slice(start, end).Interface() -} - -// contains reports whether item is present in slice (or substr in a string). -// -// {{if contains .Tags "go"}}...{{end}} -// {{if contains .Bio "engineer"}}...{{end}} -func contains(collection, item interface{}) bool { - // string substring check - if s, ok := collection.(string); ok { - if sub, ok := item.(string); ok { - return strings.Contains(s, sub) - } - return false - } - rv := reflect.ValueOf(collection) - if rv.Kind() != reflect.Slice { - return false - } - for i := 0; i < rv.Len(); i++ { - if reflect.DeepEqual(rv.Index(i).Interface(), item) { - return true - } - } - return false -} - -// join concatenates the elements of a string slice with sep as separator. -// -// {{join .Tags ", "}} -func join(slice []string, sep string) string { - return strings.Join(slice, sep) -} - -// ───────────────────────────────────────────── -// Logic helpers -// ───────────────────────────────────────────── - -// defaultVal returns fallback if value is the zero value or an empty string. -// -// {{defaultVal "N/A" .OptionalField}} -func defaultVal(fallback, value interface{}) interface{} { - if value == nil { - return fallback - } - rv := reflect.ValueOf(value) - if rv.IsZero() { - return fallback - } - return value -} - -// ternary returns trueVal if condition is true, falseVal otherwise. -// -// {{ternary "Active" "Inactive" .IsActive}} -func ternary(trueVal, falseVal interface{}, condition bool) interface{} { - if condition { - return trueVal - } - return falseVal -} - -// coalesce returns the first non-empty, non-nil value from the provided list. -// -// {{coalesce .Nickname .FullName "Anonymous"}} -func coalesce(values ...interface{}) interface{} { - for _, v := range values { - if v == nil { - continue - } - rv := reflect.ValueOf(v) - if !rv.IsZero() { - return v - } - } - return nil -} - -// ───────────────────────────────────────────── -// FuncMap registry -// ───────────────────────────────────────────── - -func funcMap() template.FuncMap { - return template.FuncMap{ - // Struct - "hasField": hasField, - // String - "capitalize": capitalize, - "prepend": prepend, - "strAppend": strAppend, - "split": split, - "truncate": truncate, - // Number - "fmtNumber": fmtNumber, - // Date & time - "fmtDate": fmtDate, - "timeAgo": timeAgo, - // Collections - "first": first, - "last": last, - "sliceOf": sliceOf, - "contains": contains, - "join": join, - // Logic - "defaultVal": defaultVal, - "ternary": ternary, - "coalesce": coalesce, - } -} - -// ───────────────────────────────────────────── -// Template initializer -// ───────────────────────────────────────────── - func NewTemplates(components embed.FS, templates embed.FS) { + // templates var paths []string fs.WalkDir(components, ".", func(path string, d fs.DirEntry, err error) error { if strings.Contains(d.Name(), ".html") { @@ -353,10 +31,6 @@ func NewTemplates(components embed.FS, templates embed.FS) { return nil }) - tmpl = template.Must( - template.New(""). - Funcs(funcMap()). - ParseFS(components, paths...), - ) - tmpl = template.Must(tmpl.ParseFS(templates, pathst...)) -} \ No newline at end of file + tmpla := template.Must(template.ParseFS(components, paths...)) + tmpl = template.Must(tmpla.ParseFS(templates, pathst...)) +}