281747ab by astaxie

add BeeTemplateExt

1 parent 512d1156
...@@ -17,13 +17,14 @@ import ( ...@@ -17,13 +17,14 @@ import (
17 var ( 17 var (
18 beegoTplFuncMap template.FuncMap 18 beegoTplFuncMap template.FuncMap
19 BeeTemplates map[string]*template.Template 19 BeeTemplates map[string]*template.Template
20 BeeTemplateExt string 20 BeeTemplateExt []string
21 ) 21 )
22 22
23 func init() { 23 func init() {
24 BeeTemplates = make(map[string]*template.Template) 24 BeeTemplates = make(map[string]*template.Template)
25 beegoTplFuncMap = make(template.FuncMap) 25 beegoTplFuncMap = make(template.FuncMap)
26 BeeTemplateExt = "tpl" 26 BeeTemplateExt = make([]string, 0)
27 BeeTemplateExt = append(BeeTemplateExt, "tpl", "html")
27 beegoTplFuncMap["markdown"] = MarkDown 28 beegoTplFuncMap["markdown"] = MarkDown
28 beegoTplFuncMap["dateformat"] = DateFormat 29 beegoTplFuncMap["dateformat"] = DateFormat
29 beegoTplFuncMap["date"] = Date 30 beegoTplFuncMap["date"] = Date
...@@ -116,7 +117,14 @@ func (self *templatefile) visit(paths string, f os.FileInfo, err error) error { ...@@ -116,7 +117,14 @@ func (self *templatefile) visit(paths string, f os.FileInfo, err error) error {
116 } else if (f.Mode() & os.ModeSymlink) > 0 { 117 } else if (f.Mode() & os.ModeSymlink) > 0 {
117 return nil 118 return nil
118 } else { 119 } else {
119 if strings.HasSuffix(paths, BeeTemplateExt) { 120 hasExt := false
121 for _, v := range BeeTemplateExt {
122 if strings.HasSuffix(paths, v) {
123 hasExt = true
124 break
125 }
126 }
127 if hasExt {
120 a := []byte(paths) 128 a := []byte(paths)
121 a = a[len([]byte(self.root)):] 129 a = a[len([]byte(self.root)):]
122 subdir := path.Dir(strings.TrimLeft(string(a), "/")) 130 subdir := path.Dir(strings.TrimLeft(string(a), "/"))
...@@ -133,8 +141,13 @@ func (self *templatefile) visit(paths string, f os.FileInfo, err error) error { ...@@ -133,8 +141,13 @@ func (self *templatefile) visit(paths string, f os.FileInfo, err error) error {
133 return nil 141 return nil
134 } 142 }
135 143
136 func SetGlobalTemplateExt(ext string) { 144 func AddTemplateExt(ext string) {
137 BeeTemplateExt = ext 145 for _, v := range BeeTemplateExt {
146 if v == ext {
147 return
148 }
149 }
150 BeeTemplateExt = append(BeeTemplateExt, ext)
138 } 151 }
139 152
140 func BuildTemplate(dir string) error { 153 func BuildTemplate(dir string) error {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!