Move over to Go embed directive

core/asset/assets.go

@@ -0,0 +1,70 @@
+package asset
+
+import (
+	"embed"
+	"errors"
+	"io"
+	"io/fs"
+	"mime"
+	"net/http"
+	"path"
+	"path/filepath"
+)
+
+// GetPublicFileSystem
+func GetPublicFileSystem(e embed.FS) (hfs http.FileSystem, err error) {
+	fsys, err := fs.Sub(e, "static/public")
+	if err != nil {
+		return nil, errors.New("failed GetPublicFileSystem")
+	}
+
+	return http.FS(fsys), nil
+}
+
+// FetchStatic loads static asset from embed file system.
+func FetchStatic(e embed.FS, filename string) (content, contentType string, err error) {
+	data, err := e.ReadFile("static/" + filename)
+	if err != nil {
+		return
+	}
+
+	contentType = mime.TypeByExtension(filepath.Ext(filename))
+	content = string(data)
+
+	return
+}
+
+// FetchStaticDir returns filenames within specified directory
+func FetchStaticDir(fs embed.FS, directory string) (files []string, err error) {
+	entries, err := fs.ReadDir("static/" + directory)
+	if err != nil {
+		return
+	}
+
+	for i := range entries {
+		if !entries[i].Type().IsDir() {
+			files = append(files, entries[i].Name())
+		}
+	}
+
+	return files, nil
+}
+
+// WriteStatic loads static asset from embed file system and writes to HTTP.
+func WriteStatic(fs embed.FS, prefix, requestedPath string, w http.ResponseWriter) error {
+	f, err := fs.Open(path.Join(prefix, requestedPath))
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	stat, _ := f.Stat()
+	if stat.IsDir() {
+		return errors.New("cannot write static file")
+	}
+
+	contentType := mime.TypeByExtension(filepath.Ext(requestedPath))
+	w.Header().Set("Content-Type", contentType)
+	_, err = io.Copy(w, f)
+	return err
+}

core/database/installer.go

@@ -26,7 +26,7 @@ func InstallUpgrade(runtime *env.Runtime, existingDB bool) (err error) {
 	// amLeader := false
 
 	// Get all SQL scripts.
-	scripts, err := LoadScripts()
+	scripts, err := LoadScripts(runtime)
 	if err != nil {
 		runtime.Log.Error("Database: unable to load scripts", err)
 		return

core/database/scripts.go

@@ -12,11 +12,12 @@
 package database
 
 import (
+	"embed"
 	"fmt"
 	"sort"
 
+	"github.com/documize/community/core/asset"
 	"github.com/documize/community/core/env"
-	"github.com/documize/community/server/web"
 )
 
 // Scripts holds all .SQL files for all supported database providers.
@@ -33,21 +34,19 @@ type Script struct {
 }
 
 // LoadScripts returns .SQL scripts for supported database providers.
-func LoadScripts() (s Scripts, err error) {
-	assetDir := "bindata/scripts"
-
+func LoadScripts(runtime *env.Runtime) (s Scripts, err error) {
 	// MySQL
-	s.MySQL, err = loadFiles(fmt.Sprintf("%s/mysql", assetDir))
+	s.MySQL, err = loadFiles(runtime.Assets, "scripts/mysql")
 	if err != nil {
 		return
 	}
 	// PostgreSQL
-	s.PostgreSQL, err = loadFiles(fmt.Sprintf("%s/postgresql", assetDir))
+	s.PostgreSQL, err = loadFiles(runtime.Assets, "scripts/postgresql")
 	if err != nil {
 		return
 	}
 	// PostgreSQL
-	s.SQLServer, err = loadFiles(fmt.Sprintf("%s/sqlserver", assetDir))
+	s.SQLServer, err = loadFiles(runtime.Assets, "scripts/sqlserver")
 	if err != nil {
 		return
 	}
@@ -70,20 +69,22 @@ func SpecificScripts(runtime *env.Runtime, all Scripts) (s []Script) {
 }
 
 // loadFiles returns all SQL scripts in specified folder as [][]byte.
-func loadFiles(path string) (b []Script, err error) {
-	buf := []byte{}
-	scripts, err := web.AssetDir(path)
+func loadFiles(fs embed.FS, path string) (b []Script, err error) {
+	scripts, err := asset.FetchStaticDir(fs, path)
 	if err != nil {
 		return
 	}
+
 	sort.Strings(scripts)
-	for _, file := range scripts {
-		buf, err = web.Asset(fmt.Sprintf("%s/%s", path, file))
+
+	for i := range scripts {
+		filename := scripts[i]
+		sqlfile, _, err := asset.FetchStatic(fs, fmt.Sprintf("%s/%s", path, filename))
 		if err != nil {
-			return
+			return b, err
 		}
 
-		b = append(b, Script{Version: extractVersionNumber(file), Script: buf})
+		b = append(b, Script{Version: extractVersionNumber(filename), Script: []byte(sqlfile)})
 	}
 
 	return b, nil

core/env/runtime.go

@@ -15,6 +15,7 @@ package env
 import (
 	"context"
 	"database/sql"
+	"embed"
 
 	"github.com/documize/community/domain"
 	"github.com/jmoiron/sqlx"
@@ -42,6 +43,7 @@ type Runtime struct {
 	StoreProvider StoreProvider
 	Log           Logger
 	Product       domain.Product
+	Assets        embed.FS
 }
 
 // StartTx begins database transaction with given transaction isolation level.