Integrated new bindata and dropped superfluous version checks

Author: tboerger

cmd/web.go

@@ -7,14 +7,14 @@ package cmd
 import (
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/fcgi"
 	"os"
 	"path"
 	"strings"
 
+	"github.com/go-macaron/bindata"
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
 	"github.com/go-macaron/captcha"
@@ -23,29 +23,25 @@ import (
 	"github.com/go-macaron/i18n"
 	"github.com/go-macaron/session"
 	"github.com/go-macaron/toolbox"
-	"github.com/go-xorm/xorm"
-	"github.com/mcuadros/go-version"
 	"github.com/urfave/cli"
-	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-module"
-	"github.com/gogits/go-gogs-client"
-
+	"github.com/go-gitea/gitea/conf"
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/go-gitea/gitea/modules/bindata"
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/template"
+	"github.com/go-gitea/gitea/public"
 	"github.com/go-gitea/gitea/routers"
 	"github.com/go-gitea/gitea/routers/admin"
 	apiv1 "github.com/go-gitea/gitea/routers/api/v1"
 	"github.com/go-gitea/gitea/routers/dev"
 	"github.com/go-gitea/gitea/routers/org"
 	"github.com/go-gitea/gitea/routers/repo"
 	"github.com/go-gitea/gitea/routers/user"
+	"github.com/go-gitea/gitea/templates"
 )
 
 // CmdWeb represents the available web sub-command.
@@ -68,46 +64,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"},
-		{"github.com/gogits/git-module", git.Version, "0.4.1"},
-		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.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()
@@ -122,9 +78,16 @@ func newMacaron() *macaron.Macaron {
 		m.SetURLPrefix(setting.AppSubUrl)
 	}
 	m.Use(macaron.Static(
-		path.Join(setting.StaticRootPath, "public"),
+		"public",
 		macaron.StaticOptions{
 			SkipLogging: setting.DisableRouterLog,
+			FileSystem: bindata.Static(bindata.Options{
+				Asset:      public.Asset,
+				AssetDir:   public.AssetDir,
+				AssetInfo:  public.AssetInfo,
+				AssetNames: public.AssetNames,
+				Prefix:     "",
+			}),
 		},
 	))
 	m.Use(macaron.Static(
@@ -135,23 +98,31 @@ func newMacaron() *macaron.Macaron {
 		},
 	))
 
+	templateOptions := bindata.Options{
+		Asset:      templates.Asset,
+		AssetDir:   templates.AssetDir,
+		AssetInfo:  templates.AssetInfo,
+		AssetNames: templates.AssetNames,
+		Prefix:     "",
+	}
+
 	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,
+		AppendDirectories:  []string{path.Join(setting.CustomPath, "templates")},
+		Funcs:              funcMap,
+		IndentJSON:         macaron.Env != macaron.PROD,
+		TemplateFileSystem: bindata.Templates(templateOptions),
 	}))
-	models.InitMailRender(path.Join(setting.StaticRootPath, "templates/mail"),
+	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,
@@ -195,7 +166,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"
 
@@ -37,12 +38,12 @@ type MailRender interface {
 
 var mailRender MailRender
 
-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

@@ -28,7 +28,7 @@ import (
 	git "github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/go-gitea/gitea/modules/bindata"
+	"github.com/go-gitea/gitea/conf"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/markdown"
 	"github.com/go-gitea/gitea/modules/process"
@@ -62,7 +62,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 {

modules/setting/setting.go

@@ -25,7 +25,7 @@ import (
 	"gopkg.in/ini.v1"
 	"strk.kbt.io/projects/go/libravatar"
 
-	"github.com/go-gitea/gitea/modules/bindata"
+	"github.com/go-gitea/gitea/conf"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/user"
 )
@@ -335,7 +335,7 @@ func NewContext() {
 		log.Fatal(4, "Fail to get work directory: %v", err)
 	}
 
-	Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini"))
+	Cfg, err = ini.Load(conf.MustAsset("app.ini"))
 	if err != nil {
 		log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err)
 	}