fix bindata build, fix svg assets loading

Author: wxiaoguang

modules/public/public.go

@@ -36,14 +36,17 @@ func StaticAssets() *assetfs.Layer {
 	return assetfs.Local("static", setting.StaticRootPath, "public")
 }
 
-// AssetsHandlerFunc implements the static handler for serving custom or original assets.
-func AssetsHandlerFunc(opts *Options) http.HandlerFunc {
-	var assetFS http.FileSystem
+func AssetFS() *assetfs.LayeredFS {
 	if setting.HasBuiltinBindata {
-		assetFS = assetfs.Layered(CustomAssets(), StaticAssets(), BuiltinAssets()) // old behavior: always include StaticAssets
+		return assetfs.Layered(CustomAssets(), StaticAssets(), BuiltinAssets()) // old behavior: always include StaticAssets
 	} else {
-		assetFS = assetfs.Layered(CustomAssets(), BuiltinAssets()) // now BuiltinAssets is StaticAssets
+		return assetfs.Layered(CustomAssets(), BuiltinAssets()) // now BuiltinAssets is StaticAssets
 	}
+}
+
+// AssetsHandlerFunc implements the static handler for serving custom or original assets.
+func AssetsHandlerFunc(opts *Options) http.HandlerFunc {
+	assetFS := AssetFS()
 
 	return func(resp http.ResponseWriter, req *http.Request) {
 		path := req.URL.Path

modules/public/serve_static.go

@@ -5,8 +5,20 @@
 
 package public
 
+import (
+	"time"
+
+	"code.gitea.io/gitea/modules/assetfs"
+	"code.gitea.io/gitea/modules/timeutil"
+)
+
 var _ GzipBytesProvider = (*vfsgen۰CompressedFileInfo)(nil)
 
+// GlobalModTime provide a global mod time for embedded asset files
+func GlobalModTime(filename string) time.Time {
+	return timeutil.GetExecutableModTime()
+}
+
 func BuiltinAssets() *assetfs.Layer {
 	return assetfs.Bindata("builtin(bindata)", Assets)
 }

modules/svg/discover_bindata.go

@@ -6,15 +6,18 @@ package svg
 import (
 	"fmt"
 	"html/template"
+	"path"
 	"regexp"
 	"strings"
 
 	"code.gitea.io/gitea/modules/html"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/public"
 )
 
 var (
 	// SVGs contains discovered SVGs
-	SVGs map[string]string
+	SVGs = map[string]string{}
 
 	widthRe  = regexp.MustCompile(`width="[0-9]+?"`)
 	heightRe = regexp.MustCompile(`height="[0-9]+?"`)
@@ -23,17 +26,29 @@ var (
 const defaultSize = 16
 
 // Init discovers SVGs and populates the `SVGs` variable
-func Init() {
-	SVGs = Discover()
+func Init() error {
+	files, err := public.AssetFS().ListFiles("img/svg")
+	if err != nil {
+		return err
+	}
 
 	// Remove `xmlns` because inline SVG does not need it
-	r := regexp.MustCompile(`(<svg\b[^>]*?)\s+xmlns="[^"]*"`)
-	for name, svg := range SVGs {
-		SVGs[name] = r.ReplaceAllString(svg, "$1")
+	reXmlns := regexp.MustCompile(`(<svg\b[^>]*?)\s+xmlns="[^"]*"`)
+	for _, file := range files {
+		if path.Ext(file) != ".svg" {
+			continue
+		}
+		bs, err := public.AssetFS().ReadFile("img/svg", file)
+		if err != nil {
+			log.Error("Failed to read SVG file %s: %v", file, err)
+		} else {
+			SVGs[file[:len(file)-4]] = reXmlns.ReplaceAllString(string(bs), "$1")
+		}
 	}
+	return nil
 }
 
-// Render render icons - arguments icon name (string), size (int), class (string)
+// RenderHTML renders icons - arguments icon name (string), size (int), class (string)
 func RenderHTML(icon string, others ...interface{}) template.HTML {
 	size, class := html.ParseSizeAndClass(defaultSize, "", others...)
 

modules/svg/discover_nobindata.go

@@ -5,6 +5,18 @@
 
 package templates
 
+import (
+	"time"
+
+	"code.gitea.io/gitea/modules/assetfs"
+	"code.gitea.io/gitea/modules/timeutil"
+)
+
+// GlobalModTime provide a global mod time for embedded asset files
+func GlobalModTime(filename string) time.Time {
+	return timeutil.GetExecutableModTime()
+}
+
 func BuiltinAssets() *assetfs.Layer {
 	return assetfs.Bindata("builtin(bindata)", Assets)
 }

modules/svg/svg.go

@@ -172,7 +172,7 @@ func GlobalInitInstalled(ctx context.Context) {
 	mustInit(ssh.Init)
 
 	auth.Init()
-	svg.Init()
+	mustInit(svg.Init)
 
 	actions_service.Init()
 

modules/templates/static.go

@@ -47,6 +47,5 @@ func reloadSettings(ctx context.Context) {
 		} else {
 			log.Fatal("ORM engine initialization failed: %v", err)
 		}
-		svg.Init()
 	}
 }