diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-23 02:16:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-22 14:16:22 -0400 |
commit | 88201914767e15a51c910d295647d97973fa09bf (patch) | |
tree | 460ac508dc67089db99877d5394db98844283f27 /modules/templates/helper.go | |
parent | c0d105609f120839c91679b0548b9438155c4bba (diff) | |
download | gitea-88201914767e15a51c910d295647d97973fa09bf.tar.gz gitea-88201914767e15a51c910d295647d97973fa09bf.zip |
Improve template helper functions: string/slice (#24266)
Follow #23328
The improvements:
1. The `contains` functions are covered by tests
2. The inconsistent behavior of `containGeneric` is replaced by
`StringUtils.Contains` and `SliceUtils.Contains`
3. In the future we can move more help functions into XxxUtils to
simplify the `helper.go` and reduce unnecessary global functions.
FAQ:
1. Why it's called `StringUtils.Contains` but not `strings.Contains`
like Golang?
Because our `StringUtils` is not Golang's `strings` package. There will
be our own string functions.
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'modules/templates/helper.go')
-rw-r--r-- | modules/templates/helper.go | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 42680827eb..c5b77989be 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -15,7 +15,6 @@ import ( "mime" "net/url" "path/filepath" - "reflect" "regexp" "strings" "time" @@ -68,11 +67,15 @@ func NewFuncMap() []template.FuncMap { "PathEscape": url.PathEscape, "PathEscapeSegments": util.PathEscapeSegments, + // utils + "StringUtils": NewStringUtils, + "SliceUtils": NewSliceUtils, + // ----------------------------------------------------------------- // string / json + // TODO: move string helper functions to StringUtils "Join": strings.Join, "DotEscape": DotEscape, - "HasPrefix": strings.HasPrefix, "EllipsisString": base.EllipsisString, "DumpVar": dumpVar, @@ -145,35 +148,6 @@ func NewFuncMap() []template.FuncMap { }, // ----------------------------------------------------------------- - // slice - "containGeneric": func(arr, v interface{}) bool { - arrV := reflect.ValueOf(arr) - if arrV.Kind() == reflect.String && reflect.ValueOf(v).Kind() == reflect.String { - return strings.Contains(arr.(string), v.(string)) - } - if arrV.Kind() == reflect.Slice { - for i := 0; i < arrV.Len(); i++ { - iV := arrV.Index(i) - if !iV.CanInterface() { - continue - } - if iV.Interface() == v { - return true - } - } - } - return false - }, - "contain": func(s []int64, id int64) bool { - for i := 0; i < len(s); i++ { - if s[i] == id { - return true - } - } - return false - }, - - // ----------------------------------------------------------------- // setting "AppName": func() string { return setting.AppName |