Integrated bindata for public and templates

.gitignore

@@ -28,6 +28,9 @@ _testmain.go
 
 coverage.out
 
+/templates/bindata.go
+/public/bindata.go
+
 *.db
 *.log
 

Makefile

@@ -37,12 +37,6 @@ clean:
  go clean -i ./...
  rm -rf $(BIN) $(DIST)
 
-.PHONY: deps
-deps:
- @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
- go get -u github.com/jteeuwen/go-bindata/...; \
- fi
-
 .PHONY: fmt
 fmt:
  go fmt $(PACKAGES)
@@ -51,6 +45,13 @@ fmt:
 vet:
  go vet $(PACKAGES)
 
+.PHONY: generate
+generate:
+ @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
+ go get -u github.com/jteeuwen/go-bindata/...; \
+ fi
+ go generate $(PACKAGES)
+
 .PHONY: errcheck
 errcheck:
  @which errcheck > /dev/null; if [ $$? -ne 0 ]; then \
@@ -124,14 +125,6 @@ latest-check:
 .PHONY: publish
 publish: release latest
 
-.PHONY: bindata
-bindata: modules/bindata/bindata.go
-
-.IGNORE: modules/bindata/bindata.go
-modules/bindata/bindata.go: $(BINDATA)
- go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/...
- go fmt $@
-
 .PHONY: javascripts
 javascripts: public/js/index.js
 
@@ -146,5 +139,5 @@ stylesheets: public/css/index.css
 public/css/index.css: $(STYLESHEETS)
  lessc $< $@
 
-.PHONY: generate
-generate: bindata javascripts stylesheets
+.PHONY: assets
+assets: javascripts stylesheets

cmd/web.go

@@ -7,7 +7,6 @@ package cmd
 import (
  "crypto/tls"
  "fmt"
- "io/ioutil"
  "net"
  "net/http"
  "net/http/fcgi"
@@ -16,20 +15,22 @@ import (
  "strings"
 
  "code.gitea.io/git"
+ "code.gitea.io/gitea/conf"
  "code.gitea.io/gitea/models"
  "code.gitea.io/gitea/modules/auth"
- "code.gitea.io/gitea/modules/bindata"
  "code.gitea.io/gitea/modules/context"
  "code.gitea.io/gitea/modules/log"
  "code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/template"
+ "code.gitea.io/gitea/public"
  "code.gitea.io/gitea/routers"
  "code.gitea.io/gitea/routers/admin"
  apiv1 "code.gitea.io/gitea/routers/api/v1"
  "code.gitea.io/gitea/routers/dev"
  "code.gitea.io/gitea/routers/org"
  "code.gitea.io/gitea/routers/repo"
  "code.gitea.io/gitea/routers/user"
+ "code.gitea.io/gitea/templates"
+ "github.com/go-macaron/bindata"
  "github.com/go-macaron/binding"
  "github.com/go-macaron/cache"
  "github.com/go-macaron/captcha"
@@ -73,45 +74,6 @@ type VerChecker struct {
  Expected string
 }
 
-// checkVersion checks if binary matches the version of templates files.
-func checkVersion() {
- // Templates.
- data, err := ioutil.ReadFile(setting.StaticRootPath + "/templates/.VERSION")
- if err != nil {
- log.Fatal(4, "Fail to read 'templates/.VERSION': %v", err)
- }
- tplVer := string(data)
- if tplVer != setting.AppVer {
- if version.Compare(tplVer, setting.AppVer, ">") {
- log.Fatal(4, "Binary version is lower than template file version, did you forget to recompile Gogs?")
- } else {
- log.Fatal(4, "Binary version is higher than template file version, did you forget to update template files?")
- }
- }
-
- // Check dependency version.
- checkers := []VerChecker{
- {"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.5.5"},
- {"github.com/go-macaron/binding", binding.Version, "0.3.2"},
- {"github.com/go-macaron/cache", cache.Version, "0.1.2"},
- {"github.com/go-macaron/csrf", csrf.Version, "0.1.0"},
- {"github.com/go-macaron/i18n", i18n.Version, "0.3.0"},
- {"github.com/go-macaron/session", session.Version, "0.1.6"},
- {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
- {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
- {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
- {"code.gitea.io/git", git.Version, "0.4.1"},
- }
- for _, c := range checkers {
- if !version.Compare(c.Version(), c.Expected, ">=") {
- log.Fatal(4, `Dependency outdated!
-Package '%s' current version (%s) is below requirement (%s),
-please use following command to update this package and recompile Gogs:
-go get -u %[1]s`, c.ImportPath, c.Version(), c.Expected)
- }
- }
-}
-
 // newMacaron initializes Macaron instance.
 func newMacaron() *macaron.Macaron {
  m := macaron.New()
@@ -125,9 +87,9 @@ func newMacaron() *macaron.Macaron {
  if setting.Protocol == setting.FCGI {
  m.SetURLPrefix(setting.AppSubURL)
  }
- m.Use(macaron.Static(
- path.Join(setting.StaticRootPath, "public"),
- macaron.StaticOptions{
+ m.Use(public.Static(
+ &public.Options{
+  Directory: path.Join(setting.StaticRootPath, "public"),
  SkipLogging: setting.DisableRouterLog,
  },
  ))
@@ -139,23 +101,31 @@ func newMacaron() *macaron.Macaron {
  },
  ))
 
- funcMap := template.NewFuncMap()
- m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: path.Join(setting.StaticRootPath, "templates"),
- AppendDirectories: []string{path.Join(setting.CustomPath, "templates")},
- Funcs: funcMap,
- IndentJSON: macaron.Env != macaron.PROD,
- }))
- models.InitMailRender(path.Join(setting.StaticRootPath, "templates/mail"),
- path.Join(setting.CustomPath, "templates/mail"), funcMap)
+ m.Use(templates.Renderer(
+ &templates.Options{
+ Directory: path.Join(setting.StaticRootPath, "templates"),
+ AppendDirectories: []string{path.Join(setting.CustomPath, "templates")},
+ },
+ ))
+
+ // templateOptions := bindata.Options{
+ // Asset: templates.Asset,
+ // AssetDir: templates.AssetDir,
+ // AssetInfo: templates.AssetInfo,
+ // AssetNames: templates.AssetNames,
+ // Prefix: "",
+ // }
+
+ // models.InitMailRender(templateOptions,
+ // path.Join(setting.CustomPath, "templates/mail"), funcMap)
 
- localeNames, err := bindata.AssetDir("conf/locale")
+ localeNames, err := conf.AssetDir("locale")
  if err != nil {
  log.Fatal(4, "Fail to list locale files: %v", err)
  }
  localFiles := make(map[string][]byte)
  for _, name := range localeNames {
- localFiles[name] = bindata.MustAsset("conf/locale/" + name)
+ localFiles[name] = conf.MustAsset("locale/" + name)
  }
  m.Use(i18n.I18n(i18n.Options{
  SubURL: setting.AppSubURL,
@@ -199,7 +169,6 @@ func runWeb(ctx *cli.Context) error {
  setting.CustomConf = ctx.String("config")
  }
  routers.GlobalInit()
- checkVersion()
 
  m := newMacaron()
 

models/mail.go

@@ -9,6 +9,7 @@ import (
  "html/template"
  "path"
 
+ "github.com/go-macaron/bindata"
  "gopkg.in/gomail.v2"
  "gopkg.in/macaron.v1"
 
@@ -38,12 +39,12 @@ type mailRenderInterface interface {
 var mailRender mailRenderInterface
 
 // InitMailRender initializes the macaron mail renderer
-func InitMailRender(dir, appendDir string, funcMap []template.FuncMap) {
+func InitMailRender(templateOptions bindata.Options, appendDir string, funcMap []template.FuncMap) {
  opt := &macaron.RenderOptions{
- Directory: dir,
- AppendDirectories: []string{appendDir},
- Funcs: funcMap,
- Extensions: []string{".tmpl", ".html"},
+ TemplateFileSystem: bindata.Templates(templateOptions),
+ AppendDirectories:  []string{appendDir},
+ Funcs:  funcMap,
+ Extensions:  []string{".tmpl", ".html"},
  }
  ts := macaron.NewTemplateSet()
  ts.Set(macaron.DEFAULT_TPL_SET_NAME, opt)

models/repo.go

@@ -20,7 +20,7 @@ import (
  "time"
 
  "code.gitea.io/git"
- "code.gitea.io/gitea/modules/bindata"
+ "code.gitea.io/gitea/conf"
  "code.gitea.io/gitea/modules/log"
  "code.gitea.io/gitea/modules/markdown"
  "code.gitea.io/gitea/modules/process"
@@ -60,7 +60,7 @@ func LoadRepoConfig() {
  types := []string{"gitignore", "license", "readme", "label"}
  typeFiles := make([][]string, 4)
  for i, t := range types {
- files, err := bindata.AssetDir("conf/" + t)
+ files, err := conf.AssetDir(t)
  if err != nil {
  log.Fatal(4, "Fail to get %s files: %v", t, err)
  }
@@ -771,14 +771,14 @@ type CreateRepoOptions struct {
 }
 
 func getRepoInitFile(tp, name string) ([]byte, error) {
- relPath := path.Join("conf", tp, strings.TrimLeft(name, "./"))
+ relPath := path.Join(tp, strings.TrimLeft(name, "./"))
 
  // Use custom file when available.
- customPath := path.Join(setting.CustomPath, relPath)
+ customPath := path.Join(setting.CustomPath, "conf", relPath)
  if com.IsFile(customPath) {
  return ioutil.ReadFile(customPath)
  }
- return bindata.Asset(relPath)
+ return conf.Asset(relPath)
 }
 
 func prepareRepoCommit(repo *Repository, tmpDir, repoPath string, opts CreateRepoOptions) error {