Use Go embed (#10)

Author: wargio

assets.go

@@ -1,44 +1,48 @@
 module github.com/rizinorg/rizin-notebook
 
-go 1.23.0
+go 1.24.0
 
 toolchain go1.24.1
 
 require (
-	github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c
-	github.com/gin-gonic/gin v1.10.0
-	github.com/jessevdk/go-assets v0.0.0-20160921144138-4f4301a06e15
-	golang.org/x/sync v0.12.0
+	github.com/dop251/goja v0.0.0-20251008123653-cf18d89f3cf6
+	github.com/gin-gonic/gin v1.11.0
+	golang.org/x/sync v0.17.0
 )
 
 require (
-	github.com/bytedance/sonic v1.13.2 // indirect
-	github.com/bytedance/sonic/loader v0.2.4 // indirect
-	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/bytedance/gopkg v0.1.3 // indirect
+	github.com/bytedance/sonic v1.14.2 // indirect
+	github.com/bytedance/sonic/loader v0.4.0 // indirect
+	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.25.0 // indirect
+	github.com/go-playground/validator/v10 v10.28.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
+	github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
+	github.com/quic-go/quic-go v0.55.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
-	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/ugorji/go/codec v1.3.1 // indirect
+	go.uber.org/mock v0.6.0 // indirect
+	golang.org/x/arch v0.22.0 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 )

go.mod

@@ -1,16 +1,20 @@
 package main
 
 import (
+	"embed"
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"html/template"
-	"io/ioutil"
+	"io/fs"
 	"net/http"
 	"path"
 	"strings"
 )
 
+//go:embed assets/*
+var Assets embed.FS
+
 var functionMap = template.FuncMap{
 	"raw": func(b []byte) template.HTML {
 		return template.HTML(b)
@@ -32,32 +36,21 @@ var functionMap = template.FuncMap{
 
 func loadEmbedded() (*template.Template, error) {
 	t := template.New("")
-	for name, file := range Assets.Files {
-		if file.IsDir() || !strings.HasSuffix(name, ".tmpl") {
-			continue
-		}
-		h, err := ioutil.ReadAll(file)
-		if err != nil {
-			return nil, err
-		}
-		t, err = t.New(path.Base(name)).Funcs(functionMap).Parse(string(h))
-		if err != nil {
-			return nil, err
+	fs.WalkDir(Assets, ".", func(filePath string, file fs.DirEntry, err error) error {
+		if file.IsDir() || !strings.HasSuffix(file.Name(), ".tmpl") {
+			return nil
 		}
-	}
+
+		h, _ := Assets.ReadFile(filePath)
+		t, err = t.New(file.Name()).Funcs(functionMap).Parse(string(h))
+		return err
+	})
 	return t, nil
 }
 
 func loadAsset(file string) ([]byte, error) {
-	asset, err := Assets.Open("/assets/static/" + file)
-	if err != nil {
-		return nil, nil
-	}
-	content, err := ioutil.ReadAll(asset)
-	if err != nil {
-		return nil, err
-	}
-	return content, nil
+	file = path.Base(file)
+	return Assets.ReadFile("assets/static/" + file)
 }
 
 func setupTemplate(assets string, router *gin.Engine) (string, string) {