From 7645acdcbd8edad9e4e194fcc0a9aac3d9ef1e0d Mon Sep 17 00:00:00 2001 From: Adnan Maolood Date: Mon, 10 May 2021 15:01:22 -0400 Subject: [PATCH] Move funcs to funcs.go --- config.go | 41 ----------------------------------------- funcs.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 funcs.go diff --git a/config.go b/config.go index f8d5367..f3327f9 100644 --- a/config.go +++ b/config.go @@ -2,9 +2,7 @@ package main import ( "fmt" - htemplate "html/template" "os" - "path" "strings" "text/template" @@ -97,42 +95,3 @@ func LoadConfig(path string) (*Config, error) { return c, nil } - -var funcs = map[string]interface{}{ - "path": func() _path { return _path{} }, - "strings": func() _strings { return _strings{} }, - "safeHTML": func(s string) htemplate.HTML { return htemplate.HTML(s) }, - "safeHTMLAttr": func(s string) htemplate.HTMLAttr { return htemplate.HTMLAttr(s) }, - "safeCSS": func(s string) htemplate.CSS { return htemplate.CSS(s) }, - "safeJS": func(s string) htemplate.JS { return htemplate.JS(s) }, - "safeURL": func(s string) htemplate.URL { return htemplate.URL(s) }, -} - -type _path struct{} - -func (_path) Base(s string) string { return path.Base(s) } -func (_path) Clean(s string) string { return path.Clean(s) } -func (_path) Dir(s string) string { return path.Dir(s) } -func (_path) Ext(s string) string { return path.Ext(s) } -func (_path) Join(elem ...string) string { return path.Join(elem...) } -func (_path) Split(s string) (string, string) { return path.Split(s) } - -type _strings struct{} - -func (_strings) Count(a, b string) int { return strings.Count(a, b) } -func (_strings) HasPrefix(a, b string) bool { return strings.HasPrefix(a, b) } -func (_strings) HasSuffix(a, b string) bool { return strings.HasSuffix(a, b) } -func (_strings) Join(elems []string, s string) string { return strings.Join(elems, s) } -func (_strings) Repeat(s string, i int) string { return strings.Repeat(s, i) } -func (_strings) Replace(a, b, c string, n int) string { return strings.Replace(a, b, c, n) } -func (_strings) ReplaceAll(a, b, c string) string { return strings.ReplaceAll(a, b, c) } -func (_strings) Split(a, b string) []string { return strings.Split(a, b) } -func (_strings) Title(s string) string { return strings.Title(s) } -func (_strings) ToLower(s string) string { return strings.ToLower(s) } -func (_strings) ToUpper(s string) string { return strings.ToUpper(s) } -func (_strings) Trim(a, b string) string { return strings.Trim(a, b) } -func (_strings) TrimLeft(a, b string) string { return strings.TrimLeft(a, b) } -func (_strings) TrimPrefix(a, b string) string { return strings.TrimPrefix(a, b) } -func (_strings) TrimRight(a, b string) string { return strings.TrimRight(a, b) } -func (_strings) TrimSpace(s string) string { return strings.TrimSpace(s) } -func (_strings) TrimSuffix(a, b string) string { return strings.TrimSuffix(a, b) } diff --git a/funcs.go b/funcs.go new file mode 100644 index 0000000..90de897 --- /dev/null +++ b/funcs.go @@ -0,0 +1,46 @@ +package main + +import ( + "html/template" + "path" + "strings" +) + +var funcs = map[string]interface{}{ + "path": func() _path { return _path{} }, + "strings": func() _strings { return _strings{} }, + "safeHTML": func(s string) template.HTML { return template.HTML(s) }, + "safeHTMLAttr": func(s string) template.HTMLAttr { return template.HTMLAttr(s) }, + "safeCSS": func(s string) template.CSS { return template.CSS(s) }, + "safeJS": func(s string) template.JS { return template.JS(s) }, + "safeURL": func(s string) template.URL { return template.URL(s) }, +} + +type _path struct{} + +func (_path) Base(s string) string { return path.Base(s) } +func (_path) Clean(s string) string { return path.Clean(s) } +func (_path) Dir(s string) string { return path.Dir(s) } +func (_path) Ext(s string) string { return path.Ext(s) } +func (_path) Join(elem ...string) string { return path.Join(elem...) } +func (_path) Split(s string) (string, string) { return path.Split(s) } + +type _strings struct{} + +func (_strings) Count(a, b string) int { return strings.Count(a, b) } +func (_strings) HasPrefix(a, b string) bool { return strings.HasPrefix(a, b) } +func (_strings) HasSuffix(a, b string) bool { return strings.HasSuffix(a, b) } +func (_strings) Join(elems []string, s string) string { return strings.Join(elems, s) } +func (_strings) Repeat(s string, i int) string { return strings.Repeat(s, i) } +func (_strings) Replace(a, b, c string, n int) string { return strings.Replace(a, b, c, n) } +func (_strings) ReplaceAll(a, b, c string) string { return strings.ReplaceAll(a, b, c) } +func (_strings) Split(a, b string) []string { return strings.Split(a, b) } +func (_strings) Title(s string) string { return strings.Title(s) } +func (_strings) ToLower(s string) string { return strings.ToLower(s) } +func (_strings) ToUpper(s string) string { return strings.ToUpper(s) } +func (_strings) Trim(a, b string) string { return strings.Trim(a, b) } +func (_strings) TrimLeft(a, b string) string { return strings.TrimLeft(a, b) } +func (_strings) TrimPrefix(a, b string) string { return strings.TrimPrefix(a, b) } +func (_strings) TrimRight(a, b string) string { return strings.TrimRight(a, b) } +func (_strings) TrimSpace(s string) string { return strings.TrimSpace(s) } +func (_strings) TrimSuffix(a, b string) string { return strings.TrimSuffix(a, b) }