From 155e7a4116c41c81d565dfab31c1ffc9c9dbcac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20P=C3=A9rez?= Date: Thu, 15 May 2025 14:33:40 +0200 Subject: [PATCH] update library --- app.go | 6 +- excel2struct/Book1.xlsx | Bin 11630 -> 0 bytes excel2struct/README.md | 36 --------- excel2struct/exceltostruct.go | 63 ---------------- go.mod | 9 +-- go.sum | 17 ----- pgutils/pgutils.go | 97 ------------------------- pgx.go | 91 +++++++++++++++++++++++ pgutils/pgutils_test.go => pgx_test.go | 2 +- render.go | 34 ++++++++- router.go | 61 ++++++++++++++++ templates.go | 28 +++++++ templates/functions.go | 34 --------- 13 files changed, 218 insertions(+), 260 deletions(-) delete mode 100644 excel2struct/Book1.xlsx delete mode 100644 excel2struct/README.md delete mode 100644 excel2struct/exceltostruct.go delete mode 100644 pgutils/pgutils.go rename pgutils/pgutils_test.go => pgx_test.go (99%) create mode 100644 router.go delete mode 100644 templates/functions.go diff --git a/app.go b/app.go index b3d8979..a483e74 100644 --- a/app.go +++ b/app.go @@ -87,7 +87,7 @@ type Paseto struct { Duration time.Duration } -func New(config ...Config) *App { +func NewApp(config ...Config) *App { cfg := Config{ Name: "", Version: "", @@ -157,7 +157,7 @@ func New(config ...Config) *App { var err error if os.Getenv("PASETO_ASYMMETRIC_KEY") != "" { - slog.Info("using paseto asymmetric key from env") + slog.Debug("using paseto asymmetric key from env") ak, err = paseto.NewV4AsymmetricSecretKeyFromHex(os.Getenv("PASETO_ASYMMETRIC_KEY")) if err != nil { slog.Error("error creating asymmetric key", "error", err) @@ -207,7 +207,7 @@ func New(config ...Config) *App { ) if cfg.EnvMode != EnvironmentProduction { - slog.Info("paseto_assymetric_key", "key", cfg.Paseto.AsymmetricKey.ExportHex()) + slog.Debug("paseto_assymetric_key", "key", cfg.Paseto.AsymmetricKey.ExportHex()) } if cfg.CreateTemplates { diff --git a/excel2struct/Book1.xlsx b/excel2struct/Book1.xlsx deleted file mode 100644 index c98d687cd907aaa5f28d64dd0dc2fd25b80cbd38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11630 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 diff --git a/excel2struct/README.md b/excel2struct/README.md deleted file mode 100644 index b82297e..0000000 --- a/excel2struct/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# excel2struct - -Convierte una hoja de excel compatible con la librería [Excelize](https://github.com/qax-os/excelize) a un tipo estructurado de Go. La primera fila debe coincidir con la etiqueta XLSX, sensible a las mayúsculas. - -| Id | Nombre | Apellidos | Email | Género | Balance | -|----|--------|-----------|--------------------------|--------|---------| -| 1 | Caryl | Kimbrough | ckimbrough0@fotki.com | true | 571.08 | -| 2 | Robin | Bozward | rbozward1@thetimes.co.uk | true | 2162.89 | -| 3 | Tabbie | Kaygill | tkaygill2@is.gd | false | 703.94 | - -```go -type User struct { - Id int `xlsx:"Id"` - Name string `xlsx:"Nombre"` - LastName string `xlsx:"Apellidos"` - Email string `xlsx:"Email"` - Gender bool `xlsx:"Género"` - Balance float32 `xlsx:"Balance"` -} -``` - -```go -func main() { - data := exceltostruct.Convert[User]("Book1.xlsx", "Sheet1") - fmt.Println(data) -} -``` - -```bash -[{1 Caryl Kimbrough ckimbrough0@fotki.com true 571.08} {2 Robin Bozward rbozward1@thetimes.co.uk true 2162.89} {3 Tabbie Kaygill tkaygill2@is.gd false 703.94}] -``` - -Donde el primer parámetro es la ruta donde está ubicada la hoja de cálculo y la segunda el nombre de la hoja. - -Tipos compatibles: **int**, **float32**, **bool** y **string**. - diff --git a/excel2struct/exceltostruct.go b/excel2struct/exceltostruct.go deleted file mode 100644 index 1f5023b..0000000 --- a/excel2struct/exceltostruct.go +++ /dev/null @@ -1,63 +0,0 @@ -package exceltostruct - -import ( - "github.com/xuri/excelize/v2" - "reflect" - "strconv" -) - -func Convert[T any](bookPath, sheetName string) (dataExcel []T) { - f, _ := excelize.OpenFile(bookPath) - rows, _ := f.GetRows(sheetName) - - firstRow := map[string]int{} - - for i, row := range rows[0] { - firstRow[row] = i - } - - t := new(T) - dataExcel = make([]T, 0, len(rows)-1) - - for _, row := range rows[1:] { - v := reflect.ValueOf(t) - if v.Kind() == reflect.Pointer { - v = v.Elem() - } - - for i := 0; i < v.NumField(); i++ { - tag := v.Type().Field(i).Tag.Get("xlsx") - objType := v.Field(i).Type().String() - - if j, ok := firstRow[tag]; ok { - field := v.Field(i) - if len(row) > j { - d := row[j] - elementConverted := convertType(objType, d) - field.Set(reflect.ValueOf(elementConverted)) - } - } - } - - dataExcel = append(dataExcel, *t) - } - - return dataExcel -} - -func convertType(objType string, value string) any { - switch objType { - case "int": - valueInt, _ := strconv.Atoi(value) - return valueInt - case "bool": - valueBool, _ := strconv.ParseBool(value) - return valueBool - case "float32": - valueFloat, _ := strconv.ParseFloat(value, 32) - return float32(valueFloat) - case "string": - return value - } - return value -} diff --git a/go.mod b/go.mod index 06749fb..96ad00a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/zepyrshut/go-blocks/v2 -go 1.24.3 +go 1.24 require ( github.com/alexedwards/scs/v2 v2.8.0 @@ -9,7 +9,6 @@ require ( github.com/jackc/pgconn v1.14.3 github.com/jackc/pgx/v5 v5.7.4 github.com/stretchr/testify v1.10.0 - github.com/xuri/excelize/v2 v2.9.0 ) require ( @@ -32,13 +31,7 @@ require ( github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/richardlehane/mscfb v1.0.4 // indirect - github.com/richardlehane/msoleps v1.0.4 // indirect - github.com/xuri/efp v0.0.1 // indirect - github.com/xuri/nfp v0.0.1 // indirect golang.org/x/crypto v0.38.0 // indirect - golang.org/x/net v0.40.0 // indirect golang.org/x/sync v0.14.0 // indirect golang.org/x/sys v0.33.0 // indirect golang.org/x/text v0.25.0 diff --git a/go.sum b/go.sum index e86acc0..e5edc3e 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,6 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -81,11 +79,6 @@ 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/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= -github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= -github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= -github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00= -github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -94,12 +87,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8= -github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= -github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE= -github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE= -github.com/xuri/nfp v0.0.1 h1:MDamSGatIvp8uOmDP8FnmjuQpu90NzdJxo7242ANR9Q= -github.com/xuri/nfp v0.0.1/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= @@ -112,10 +99,6 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= -golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= -golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= diff --git a/pgutils/pgutils.go b/pgutils/pgutils.go deleted file mode 100644 index b21bf5e..0000000 --- a/pgutils/pgutils.go +++ /dev/null @@ -1,97 +0,0 @@ -package pgutils - -import ( - "log/slog" - "math" - "math/big" - "strconv" - - "github.com/jackc/pgx/v5/pgtype" -) - -func NumericToFloat64(n pgtype.Numeric) float64 { - val, err := n.Value() - if err != nil { - slog.Error("error getting numeric value", "error", err) - return 0 - } - - strValue, ok := val.(string) - if !ok { - slog.Error("error converting numeric value to string") - return 0 - } - - floatValue, err := strconv.ParseFloat(strValue, 64) - if err != nil { - slog.Error("error converting string to float", "error", err) - return 0 - } - - return floatValue -} - -func NumericToInt64(n pgtype.Numeric) int64 { - return n.Int.Int64() * int64(math.Pow(10, float64(n.Exp))) -} - -func FloatToNumeric(number float64, precision int) (value pgtype.Numeric) { - parse := strconv.FormatFloat(number, 'f', precision, 64) - slog.Info("parse", "parse", parse) - - if err := value.Scan(parse); err != nil { - slog.Error("error scanning numeric", "error", err) - } - return value -} - -func AddNumeric(a, b pgtype.Numeric) pgtype.Numeric { - minExp := min(a.Exp, b.Exp) - - aInt := new(big.Int).Set(a.Int) - bInt := new(big.Int).Set(b.Int) - - for a.Exp > minExp { - aInt.Mul(aInt, big.NewInt(10)) - a.Exp-- - } - for b.Exp > minExp { - bInt.Mul(bInt, big.NewInt(10)) - b.Exp-- - } - - resultado := new(big.Int).Add(aInt, bInt) - - return pgtype.Numeric{ - Int: resultado, - Exp: minExp, - Valid: true, - } -} - -func SubtractNumeric(a, b pgtype.Numeric) pgtype.Numeric { - minExp := a.Exp - if b.Exp < minExp { - minExp = b.Exp - } - - aInt := new(big.Int).Set(a.Int) - bInt := new(big.Int).Set(b.Int) - - for a.Exp > minExp { - aInt.Mul(aInt, big.NewInt(10)) - a.Exp-- - } - for b.Exp > minExp { - bInt.Mul(bInt, big.NewInt(10)) - b.Exp-- - } - - resultado := new(big.Int).Sub(aInt, bInt) - - return pgtype.Numeric{ - Int: resultado, - Exp: minExp, - Valid: true, - } -} diff --git a/pgx.go b/pgx.go index b87712d..4c25297 100644 --- a/pgx.go +++ b/pgx.go @@ -3,10 +3,14 @@ package goblocks import ( "context" "log/slog" + "math" + "math/big" + "strconv" "sync" _ "github.com/jackc/pgconn" _ "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/pgxpool" _ "github.com/jackc/pgx/v5/stdlib" ) @@ -57,3 +61,90 @@ func (a *App) ClosePGXPools() { slog.Info("closed database connection", "name", name) } } + +func NumericToFloat64(n pgtype.Numeric) float64 { + val, err := n.Value() + if err != nil { + slog.Error("error getting numeric value", "error", err) + return 0 + } + + strValue, ok := val.(string) + if !ok { + slog.Error("error converting numeric value to string") + return 0 + } + + floatValue, err := strconv.ParseFloat(strValue, 64) + if err != nil { + slog.Error("error converting string to float", "error", err) + return 0 + } + + return floatValue +} + +func NumericToInt64(n pgtype.Numeric) int64 { + return n.Int.Int64() * int64(math.Pow(10, float64(n.Exp))) +} + +func FloatToNumeric(number float64, precision int) (value pgtype.Numeric) { + parse := strconv.FormatFloat(number, 'f', precision, 64) + slog.Info("parse", "parse", parse) + + if err := value.Scan(parse); err != nil { + slog.Error("error scanning numeric", "error", err) + } + return value +} + +func AddNumeric(a, b pgtype.Numeric) pgtype.Numeric { + minExp := min(a.Exp, b.Exp) + + aInt := new(big.Int).Set(a.Int) + bInt := new(big.Int).Set(b.Int) + + for a.Exp > minExp { + aInt.Mul(aInt, big.NewInt(10)) + a.Exp-- + } + for b.Exp > minExp { + bInt.Mul(bInt, big.NewInt(10)) + b.Exp-- + } + + resultado := new(big.Int).Add(aInt, bInt) + + return pgtype.Numeric{ + Int: resultado, + Exp: minExp, + Valid: true, + } +} + +func SubtractNumeric(a, b pgtype.Numeric) pgtype.Numeric { + minExp := a.Exp + if b.Exp < minExp { + minExp = b.Exp + } + + aInt := new(big.Int).Set(a.Int) + bInt := new(big.Int).Set(b.Int) + + for a.Exp > minExp { + aInt.Mul(aInt, big.NewInt(10)) + a.Exp-- + } + for b.Exp > minExp { + bInt.Mul(bInt, big.NewInt(10)) + b.Exp-- + } + + resultado := new(big.Int).Sub(aInt, bInt) + + return pgtype.Numeric{ + Int: resultado, + Exp: minExp, + Valid: true, + } +} diff --git a/pgutils/pgutils_test.go b/pgx_test.go similarity index 99% rename from pgutils/pgutils_test.go rename to pgx_test.go index d1a803e..2a7ed28 100644 --- a/pgutils/pgutils_test.go +++ b/pgx_test.go @@ -1,4 +1,4 @@ -package pgutils +package goblocks import ( "fmt" diff --git a/render.go b/render.go index 0847a5e..f0b4e34 100644 --- a/render.go +++ b/render.go @@ -4,8 +4,30 @@ import ( "encoding/json" "log/slog" "net/http" + "strings" ) +type stringWriter struct { + builder strings.Builder + header http.Header +} + +func newStringWriter() *stringWriter { + return &stringWriter{ + header: make(http.Header), + } +} + +func (w *stringWriter) Header() http.Header { + return w.header +} + +func (w *stringWriter) Write(b []byte) (int, error) { + return w.builder.Write(b) +} + +func (w *stringWriter) WriteHeader(statusCode int) {} + func (a *App) JSON(w http.ResponseWriter, code int, v any) { w.Header().Set("Content-Type", "application/json") w.WriteHeader(code) @@ -14,11 +36,21 @@ func (a *App) JSON(w http.ResponseWriter, code int, v any) { func (a *App) HTML(w http.ResponseWriter, code int, name string, td *TemplateData) { w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(code) err := a.Templates.Template(w, name, td) if err != nil { slog.Error("error rendering template", "error", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } - w.WriteHeader(code) +} + +func (a *App) RenderHTML(name string, td *TemplateData) (string, error) { + sw := newStringWriter() + err := a.Templates.Template(sw, name, td) + if err != nil { + slog.Error("error rendering template", "error", err) + return "", err + } + return sw.builder.String(), nil } diff --git a/router.go b/router.go new file mode 100644 index 0000000..891253a --- /dev/null +++ b/router.go @@ -0,0 +1,61 @@ +package goblocks + +import ( + "net/http" + "slices" +) + +// Middleware is a function that wraps an http.Handler. +type Middleware func(http.Handler) http.Handler + +// Router wraps http.ServeMux and provides grouping and middleware support. +type Router struct { + globalChain []Middleware + routeChain []Middleware + isSub bool + *http.ServeMux +} + +func NewRouter() *Router { + return &Router{ServeMux: http.NewServeMux()} +} + +func (r *Router) Use(mw ...Middleware) { + if r.isSub { + r.routeChain = append(r.routeChain, mw...) + } else { + r.globalChain = append(r.globalChain, mw...) + } +} + +func (r *Router) Group(fn func(r *Router)) { + sub := &Router{ + ServeMux: r.ServeMux, + routeChain: slices.Clone(r.routeChain), + isSub: true, + } + fn(sub) +} + +func (r *Router) HandleFunc(pattern string, h http.HandlerFunc) { + r.Handle(pattern, h) +} + +func (r *Router) Handle(pattern string, h http.Handler) { + chain := slices.Clone(r.routeChain) + slices.Reverse(chain) + for _, mw := range chain { + h = mw(h) + } + r.ServeMux.Handle(pattern, h) +} + +func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) { + h := http.Handler(r.ServeMux) + chain := slices.Clone(r.globalChain) + slices.Reverse(chain) + for _, mw := range chain { + h = mw(h) + } + h.ServeHTTP(w, req) +} diff --git a/templates.go b/templates.go index 0f03137..a49254d 100644 --- a/templates.go +++ b/templates.go @@ -11,6 +11,7 @@ import ( "reflect" "strconv" "strings" + "time" ) type ( @@ -329,3 +330,30 @@ func (p Pages) PageRange(maxPagesToShow int) []Page { return pages } + +func Dict(values ...any) (map[string]any, error) { + if len(values)%2 != 0 { + return nil, errors.New("invalid dict call") + } + dict := make(map[string]any, len(values)/2) + for i := 0; i < len(values); i += 2 { + key, ok := values[i].(string) + if !ok { + return nil, errors.New("dict keys must be strings") + } + dict[key] = values[i+1] + } + return dict, nil +} + +func FormatDateSpanish(date time.Time) string { + months := []string{"enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"} + days := []string{"domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado"} + + dayName := days[date.Weekday()] + day := date.Day() + month := months[date.Month()-1] + year := date.Year() + + return dayName + ", " + strconv.Itoa(day) + " de " + month + " de " + strconv.Itoa(year) +} diff --git a/templates/functions.go b/templates/functions.go deleted file mode 100644 index 6b3063f..0000000 --- a/templates/functions.go +++ /dev/null @@ -1,34 +0,0 @@ -package templates - -import ( - "errors" - "strconv" - "time" -) - -func Dict(values ...any) (map[string]any, error) { - if len(values)%2 != 0 { - return nil, errors.New("invalid dict call") - } - dict := make(map[string]any, len(values)/2) - for i := 0; i < len(values); i += 2 { - key, ok := values[i].(string) - if !ok { - return nil, errors.New("dict keys must be strings") - } - dict[key] = values[i+1] - } - return dict, nil -} - -func FormatDateSpanish(date time.Time) string { - months := []string{"enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"} - days := []string{"domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado"} - - dayName := days[date.Weekday()] - day := date.Day() - month := months[date.Month()-1] - year := date.Year() - - return dayName + ", " + strconv.Itoa(day) + " de " + month + " de " + strconv.Itoa(year) -}