diff options
| author | Michael Li <alimy@gility.net> | 2022-03-17 14:05:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 14:05:09 +0800 |
| commit | 32c454ba5faea9dc4236c12e28e0b65f01117cc1 (patch) | |
| tree | 1eea30a83f78b311983924ba3bab00884633f508 /internal/cmd | |
| parent | 39f64a1371cdb01e02aeeb04839d2689052ae1d3 (diff) | |
assets: convert usage of go-bindata to Go embed (#6851)
Co-authored-by: Joe Chen <jc@unknwon.io>
Diffstat (limited to 'internal/cmd')
| -rw-r--r-- | internal/cmd/web.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/internal/cmd/web.go b/internal/cmd/web.go index 358ff832..097ad23a 100644 --- a/internal/cmd/web.go +++ b/internal/cmd/web.go @@ -29,9 +29,8 @@ import ( "gopkg.in/macaron.v1" log "unknwon.dev/clog/v2" + embedConf "gogs.io/gogs/conf" "gogs.io/gogs/internal/app" - "gogs.io/gogs/internal/assets/public" - "gogs.io/gogs/internal/assets/templates" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" @@ -46,6 +45,8 @@ import ( "gogs.io/gogs/internal/route/repo" "gogs.io/gogs/internal/route/user" "gogs.io/gogs/internal/template" + "gogs.io/gogs/public" + "gogs.io/gogs/templates" ) var Web = cli.Command{ @@ -83,7 +84,7 @@ func newMacaron() *macaron.Macaron { )) var publicFs http.FileSystem if !conf.Server.LoadAssetsFromDisk { - publicFs = public.NewFileSystem() + publicFs = http.FS(public.Files) } m.Use(macaron.Static( filepath.Join(conf.WorkDir(), "public"), @@ -119,13 +120,16 @@ func newMacaron() *macaron.Macaron { } m.Use(macaron.Renderer(renderOpt)) - localeNames, err := conf.AssetDir("conf/locale") + localeNames, err := embedConf.FileNames("locale") if err != nil { log.Fatal("Failed to list locale files: %v", err) } localeFiles := make(map[string][]byte) for _, name := range localeNames { - localeFiles[name] = conf.MustAsset("conf/locale/" + name) + localeFiles[name], err = embedConf.Files.ReadFile("locale/" + name) + if err != nil { + log.Fatal("Failed to read locale file %q: %v", name, err) + } } m.Use(i18n.I18n(i18n.Options{ SubURL: conf.Server.Subpath, |