Browse Source
Integrate templates into bindata optionally (#314)
Integrated optional bindata for the templatesfor-closed-social
Thomas Boerger
8 years ago
committed by
GitHub
GitHub
15 changed files with 274 additions and 107 deletions
Split View
Diff Options
-
+1 -0.gitignore
-
+3 -55cmd/web.go
-
+1 -1models/git_diff.go
-
+37 -42models/mail.go
-
+0 -0modules/highlight/highlight.go
-
+2 -0modules/public/public.go
-
+1 -1modules/public/static.go
-
+103 -0modules/templates/dynamic.go
-
+1 -1modules/templates/helper.go
-
+109 -0modules/templates/static.go
-
+10 -0modules/templates/templates.go
-
+1 -1routers/init.go
-
+2 -2routers/repo/editor.go
-
+3 -3routers/repo/view.go
-
+0 -1templates/.VERSION
+ 1
- 0
.gitignore
View File
+ 3
- 55
cmd/web.go
View File
+ 1
- 1
models/git_diff.go
View File
+ 37
- 42
models/mail.go
View File
modules/template/highlight/highlight.go → modules/highlight/highlight.go
View File
+ 2
- 0
modules/public/public.go
View File
+ 1
- 1
modules/public/static.go
View File
+ 103
- 0
modules/templates/dynamic.go
View File
| @ -0,0 +1,103 @@ | |||
| // +build !bindata | |||
| // Copyright 2016 The Gitea Authors. All rights reserved. | |||
| // Use of this source code is governed by a MIT-style | |||
| // license that can be found in the LICENSE file. | |||
| package templates | |||
| import ( | |||
| "html/template" | |||
| "io/ioutil" | |||
| "path" | |||
| "strings" | |||
| "code.gitea.io/gitea/modules/log" | |||
| "code.gitea.io/gitea/modules/setting" | |||
| "github.com/Unknwon/com" | |||
| "gopkg.in/macaron.v1" | |||
| ) | |||
| var ( | |||
| templates = template.New("") | |||
| ) | |||
| // Renderer implements the macaron handler for serving the templates. | |||
| func Renderer() macaron.Handler { | |||
| return macaron.Renderer(macaron.RenderOptions{ | |||
| Funcs: NewFuncMap(), | |||
| Directory: path.Join(setting.StaticRootPath, "templates"), | |||
| AppendDirectories: []string{ | |||
| path.Join(setting.CustomPath, "templates"), | |||
| }, | |||
| }) | |||
| } | |||
| // Mailer provides the templates required for sending notification mails. | |||
| func Mailer() *template.Template { | |||
| for _, funcs := range NewFuncMap() { | |||
| templates.Funcs(funcs) | |||
| } | |||
| staticDir := path.Join(setting.StaticRootPath, "templates", "mail") | |||
| if com.IsDir(staticDir) { | |||
| files, err := com.StatDir(staticDir) | |||
| if err != nil { | |||
| log.Warn("Failed to read %s templates dir. %v", staticDir, err) | |||
| } else { | |||
| for _, filePath := range files { | |||
| if !strings.HasSuffix(filePath, ".tmpl") { | |||
| continue | |||
| } | |||
| content, err := ioutil.ReadFile(path.Join(staticDir, filePath)) | |||
| if err != nil { | |||
| log.Warn("Failed to read static %s template. %v", filePath, err) | |||
| continue | |||
| } | |||
| templates.New( | |||
| strings.TrimSuffix( | |||
| filePath, | |||
| ".tmpl", | |||
| ), | |||
| ).Parse(string(content)) | |||
| } | |||
| } | |||
| } | |||
| customDir := path.Join(setting.CustomPath, "templates", "mail") | |||
| if com.IsDir(customDir) { | |||
| files, err := com.StatDir(customDir) | |||
| if err != nil { | |||
| log.Warn("Failed to read %s templates dir. %v", customDir, err) | |||
| } else { | |||
| for _, filePath := range files { | |||
| if !strings.HasSuffix(filePath, ".tmpl") { | |||
| continue | |||
| } | |||
| content, err := ioutil.ReadFile(path.Join(customDir, filePath)) | |||
| if err != nil { | |||
| log.Warn("Failed to read custom %s template. %v", filePath, err) | |||
| continue | |||
| } | |||
| templates.New( | |||
| strings.TrimSuffix( | |||
| filePath, | |||
| ".tmpl", | |||
| ), | |||
| ).Parse(string(content)) | |||
| } | |||
| } | |||
| } | |||
| return templates | |||
| } | |||
modules/template/template.go → modules/templates/helper.go
View File
+ 109
- 0
modules/templates/static.go
View File
| @ -0,0 +1,109 @@ | |||
| // +build bindata | |||
| // Copyright 2016 The Gitea Authors. All rights reserved. | |||
| // Use of this source code is governed by a MIT-style | |||
| // license that can be found in the LICENSE file. | |||
| package templates | |||
| import ( | |||
| "html/template" | |||
| "io/ioutil" | |||
| "path" | |||
| "strings" | |||
| "code.gitea.io/gitea/modules/log" | |||
| "code.gitea.io/gitea/modules/setting" | |||
| "github.com/Unknwon/com" | |||
| "github.com/go-macaron/bindata" | |||
| "gopkg.in/macaron.v1" | |||
| ) | |||
| var ( | |||
| templates = template.New("") | |||
| ) | |||
| // Renderer implements the macaron handler for serving the templates. | |||
| func Renderer() macaron.Handler { | |||
| return macaron.Renderer(macaron.RenderOptions{ | |||
| Funcs: NewFuncMap(), | |||
| AppendDirectories: []string{ | |||
| path.Join(setting.CustomPath, "templates"), | |||
| }, | |||
| TemplateFileSystem: bindata.Templates( | |||
| bindata.Options{ | |||
| Asset: Asset, | |||
| AssetDir: AssetDir, | |||
| AssetInfo: AssetInfo, | |||
| AssetNames: AssetNames, | |||
| Prefix: "", | |||
| }, | |||
| ), | |||
| }) | |||
| } | |||
| // Mailer provides the templates required for sending notification mails. | |||
| func Mailer() *template.Template { | |||
| for _, funcs := range NewFuncMap() { | |||
| templates.Funcs(funcs) | |||
| } | |||
| for _, assetPath := range AssetNames() { | |||
| if !strings.HasPrefix(assetPath, "mail/") { | |||
| continue | |||
| } | |||
| if !strings.HasSuffix(assetPath, ".tmpl") { | |||
| continue | |||
| } | |||
| content, err := Asset(assetPath) | |||
| if err != nil { | |||
| log.Warn("Failed to read embedded %s template. %v", assetPath, err) | |||
| continue | |||
| } | |||
| templates.New( | |||
| strings.TrimPrefix( | |||
| strings.TrimSuffix( | |||
| assetPath, | |||
| ".tmpl", | |||
| ), | |||
| "mail/", | |||
| ), | |||
| ).Parse(string(content)) | |||
| } | |||
| customDir := path.Join(setting.CustomPath, "templates", "mail") | |||
| if com.IsDir(customDir) { | |||
| files, err := com.StatDir(customDir) | |||
| if err != nil { | |||
| log.Warn("Failed to read %s templates dir. %v", customDir, err) | |||
| } else { | |||
| for _, filePath := range files { | |||
| if !strings.HasSuffix(filePath, ".tmpl") { | |||
| continue | |||
| } | |||
| content, err := ioutil.ReadFile(path.Join(customDir, filePath)) | |||
| if err != nil { | |||
| log.Warn("Failed to read custom %s template. %v", filePath, err) | |||
| continue | |||
| } | |||
| templates.New( | |||
| strings.TrimSuffix( | |||
| filePath, | |||
| ".tmpl", | |||
| ), | |||
| ).Parse(string(content)) | |||
| } | |||
| } | |||
| } | |||
| return templates | |||
| } | |||
+ 10
- 0
modules/templates/templates.go
View File
| @ -0,0 +1,10 @@ | |||
| // Copyright 2016 The Gitea Authors. All rights reserved. | |||
| // Use of this source code is governed by a MIT-style | |||
| // license that can be found in the LICENSE file. | |||
| package templates | |||
| //go:generate go-bindata -tags "bindata" -ignore "\\.go" -pkg "templates" -o "bindata.go" ../../templates/... | |||
| //go:generate go fmt bindata.go | |||
| //go:generate sed -i.bak s/..\/..\/templates\/// bindata.go | |||
| //go:generate rm -f bindata.go.bak | |||
+ 1
- 1
routers/init.go
View File
+ 2
- 2
routers/repo/editor.go
View File
+ 3
- 3
routers/repo/view.go
View File
+ 0
- 1
templates/.VERSION
View File
| @ -1 +0,0 @@ | |||
| 0.9.99.0915 | |||