server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting with gofmt

Browse Source 
Rename BeeTemplateEngines->beeTemplateEngines.  Create templateHandler function type
Fix var name in comment BeeTemplatePreprocessors -> beeTemplatePreprocessors
Rename TemplateI -> TemplateRenderer
This commit is contained in:
saturn4er 2016-03-09 10:40:12 +02:00
parent 9ee9f81861
commit 66423f6935
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staticfile_test.go
View File

@ -7,8 +7,8 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
"testing"
"path/filepath" "path/filepath"
"testing"
) )
var currentWorkDir, _ = os.Getwd() var currentWorkDir, _ = os.Getwd()

27
template.go
View File

@ -31,13 +31,13 @@ import (
var ( var (
beegoTplFuncMap = make(template.FuncMap) beegoTplFuncMap = make(template.FuncMap)
// beeTemplates caching map and supported template file extensions. // beeTemplates caching map and supported template file extensions.
beeTemplates = make(map[string]TemplateI) beeTemplates = make(map[string]TemplateRenderer)
templatesLock sync.RWMutex templatesLock sync.RWMutex
// beeTemplateExt stores the template extension which will build // beeTemplateExt stores the template extension which will build
beeTemplateExt = []string{"tpl", "html"} beeTemplateExt = []string{"tpl", "html"}
// BeeTemplatePreprocessors stores associations of extension -> preprocessor handler // beeTemplatePreprocessors stores associations of extension -> preprocessor handler
BeeTemplateEngines = map[string]func(root, path string, funcs template.FuncMap) (TemplateI, error){} beeTemplateEngines = map[string]templateHandler{}
) )
func executeTemplate(wr io.Writer, name string, data interface{}) error { func executeTemplate(wr io.Writer, name string, data interface{}) error {
@ -90,7 +90,8 @@ func AddFuncMap(key string, fn interface{}) error {
return nil return nil
} }
type TemplateI interface { type templateHandler func(root, path string, funcs template.FuncMap) (TemplateRenderer, error)
type TemplateRenderer interface {
ExecuteTemplate(wr io.Writer, name string, data interface{}) error ExecuteTemplate(wr io.Writer, name string, data interface{}) error
} }
type templateFile struct { type templateFile struct {
@ -106,7 +107,7 @@ func (tf *templateFile) visit(paths string, f os.FileInfo, err error) error {
if f == nil { if f == nil {
return err return err
} }
if f.IsDir() || (f.Mode() & os.ModeSymlink) > 0 { if f.IsDir() || (f.Mode()&os.ModeSymlink) > 0 {
return nil return nil
} }
if !HasTemplateExt(paths) { if !HasTemplateExt(paths) {
@ -124,7 +125,7 @@ func (tf *templateFile) visit(paths string, f os.FileInfo, err error) error {
// HasTemplateExt return this path contains supported template extension of beego or not. // HasTemplateExt return this path contains supported template extension of beego or not.
func HasTemplateExt(paths string) bool { func HasTemplateExt(paths string) bool {
for _, v := range beeTemplateExt { for _, v := range beeTemplateExt {
if strings.HasSuffix(paths, "." + v) { if strings.HasSuffix(paths, "."+v) {
return true return true
} }
} }
@ -167,10 +168,10 @@ func BuildTemplate(dir string, files ...string) error {
if buildAllFiles || utils.InSlice(file, files) { if buildAllFiles || utils.InSlice(file, files) {
templatesLock.Lock() templatesLock.Lock()
fileExt := filepath.Ext(file)[1:] fileExt := filepath.Ext(file)[1:]
var t TemplateI var t TemplateRenderer
if fn, ok := BeeTemplateEngines[fileExt]; ok { if fn, ok := beeTemplateEngines[fileExt]; ok {
t, err = fn(self.root, file, beegoTplFuncMap) t, err = fn(self.root, file, beegoTplFuncMap)
}else { } else {
t, err = getTemplate(self.root, file, v...) t, err = getTemplate(self.root, file, v...)
} }
if err != nil { if err != nil {
@ -318,8 +319,8 @@ func DelStaticPath(url string) *App {
return BeeApp return BeeApp
} }
func AddTemplateEngine(extension string, fn func(root, path string, funcs template.FuncMap) (TemplateI, error)) *App { func AddTemplateEngine(extension string, fn templateHandler) *App {
AddTemplateExt(extension) AddTemplateExt(extension)
BeeTemplateEngines[extension] = fn beeTemplateEngines[extension] = fn
return BeeApp return BeeApp
} }