From 32c454ba5faea9dc4236c12e28e0b65f01117cc1 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Thu, 17 Mar 2022 14:05:09 +0800 Subject: assets: convert usage of go-bindata to Go embed (#6851) Co-authored-by: Joe Chen --- internal/cmd/web.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'internal/cmd') 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, -- cgit v1.2.3