mirror of
https://github.com/astaxie/beego.git
synced 2024-12-23 08:00:50 +00:00
Merge pull request #1940 from MachineShop-IOT/develop
More flexible support for template engines
This commit is contained in:
commit
7b051e7ad1
33
template.go
33
template.go
@ -33,12 +33,12 @@ import (
|
||||
var (
|
||||
beegoTplFuncMap = make(template.FuncMap)
|
||||
// beeTemplates caching map and supported template file extensions.
|
||||
beeTemplates = make(map[string]TemplateRenderer)
|
||||
beeTemplates = make(map[string]*template.Template)
|
||||
templatesLock sync.RWMutex
|
||||
// beeTemplateExt stores the template extension which will build
|
||||
beeTemplateExt = []string{"tpl", "html"}
|
||||
// beeTemplatePreprocessors stores associations of extension -> preprocessor handler
|
||||
beeTemplateEngines = map[string]templateHandler{}
|
||||
beeTemplateEngines = map[string]templatePreProcessor{}
|
||||
)
|
||||
|
||||
// ExecuteTemplate applies the template with name to the specified data object,
|
||||
@ -50,11 +50,22 @@ func ExecuteTemplate(wr io.Writer, name string, data interface{}) error {
|
||||
defer templatesLock.RUnlock()
|
||||
}
|
||||
if t, ok := beeTemplates[name]; ok {
|
||||
err := t.ExecuteTemplate(wr, name, data)
|
||||
if err != nil {
|
||||
logs.Trace("template Execute err:", err)
|
||||
if t.Lookup(name) != nil {
|
||||
err := t.ExecuteTemplate(wr, name, data)
|
||||
if err != nil {
|
||||
logs.Trace("template Execute err:", err)
|
||||
}
|
||||
return err
|
||||
} else {
|
||||
err := t.Execute(wr, data)
|
||||
if err != nil {
|
||||
if err != nil {
|
||||
logs.Trace("template Execute err:", err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
panic("can't find templatefile in the path:" + name)
|
||||
}
|
||||
@ -94,10 +105,8 @@ func AddFuncMap(key string, fn interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
type templateHandler func(root, path string, funcs template.FuncMap) (TemplateRenderer, error)
|
||||
type TemplateRenderer interface {
|
||||
ExecuteTemplate(wr io.Writer, name string, data interface{}) error
|
||||
}
|
||||
type templatePreProcessor func(root, path string, funcs template.FuncMap) (*template.Template, error)
|
||||
|
||||
type templateFile struct {
|
||||
root string
|
||||
files map[string][]string
|
||||
@ -172,7 +181,7 @@ func BuildTemplate(dir string, files ...string) error {
|
||||
if buildAllFiles || utils.InSlice(file, files) {
|
||||
templatesLock.Lock()
|
||||
ext := filepath.Ext(file)
|
||||
var t TemplateRenderer
|
||||
var t *template.Template
|
||||
if len(ext) == 0 {
|
||||
t, err = getTemplate(self.root, file, v...)
|
||||
} else if fn, ok := beeTemplateEngines[ext[1:]]; ok {
|
||||
@ -325,7 +334,7 @@ func DelStaticPath(url string) *App {
|
||||
return BeeApp
|
||||
}
|
||||
|
||||
func AddTemplateEngine(extension string, fn templateHandler) *App {
|
||||
func AddTemplateEngine(extension string, fn templatePreProcessor) *App {
|
||||
AddTemplateExt(extension)
|
||||
beeTemplateEngines[extension] = fn
|
||||
return BeeApp
|
||||
|
Loading…
Reference in New Issue
Block a user