refactor(tpl): re-arrange theme type and instance

marjune163 · marjune163 · commit 55a0e9d4fde9 · 2022-12-15T14:24:07.000+08:00
diff --git a/src/app/main.go b/src/app/main.go
@@ -8,7 +8,8 @@ import (
 	"mjpclab.dev/ghfs/src/serverHandler"
 	"mjpclab.dev/ghfs/src/serverLog"
 	"mjpclab.dev/ghfs/src/setting"
-	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/tpl/defaultTheme"
+	"mjpclab.dev/ghfs/src/tpl/theme"
 	"mjpclab.dev/ghfs/src/util"
 	"os"
 	"path/filepath"
@@ -56,7 +57,7 @@ func NewApp(params param.Params, setting *setting.Setting) (*App, []error) {
 
 	vhSvc := goVirtualHost.NewService()
 	logFileMan := serverLog.NewFileMan()
-	themes := make(map[string]tpl.Theme)
+	themes := make(map[string]theme.Theme)
 
 	for _, p := range params {
 		// logger
@@ -66,11 +67,11 @@ func NewApp(params param.Params, setting *setting.Setting) (*App, []error) {
 		}
 
 		// theme
-		var theme tpl.Theme
+		var themeInst theme.Theme
 		if len(p.ThemeDir) > 0 {
-			theme = tpl.DirTheme(p.ThemeDir)
+			themeInst = theme.DirTheme(p.ThemeDir)
 		} else if len(p.Theme) == 0 {
-			theme = tpl.DefaultTheme
+			themeInst = defaultTheme.DefaultTheme
 		} else {
 			themeKey, err := filepath.Abs(p.Theme)
 			errs = serverError.AppendError(errs, err)
@@ -79,22 +80,22 @@ func NewApp(params param.Params, setting *setting.Setting) (*App, []error) {
 			}
 
 			var themeExists bool
-			theme, themeExists = themes[themeKey]
+			themeInst, themeExists = themes[themeKey]
 			if !themeExists {
-				theme, err = tpl.LoadMemTheme(p.Theme)
+				themeInst, err = theme.LoadMemTheme(p.Theme)
 				errs = serverError.AppendError(errs, err)
 				if err != nil {
 					continue
 				}
-				themes[themeKey] = theme
+				themes[themeKey] = themeInst
 			}
 		}
 		if len(errs) > 0 {
 			return nil, errs
 		}
 
 		// vHost Handler
-		vhHandler, errs := serverHandler.NewVhostHandler(p, logger, theme)
+		vhHandler, errs := serverHandler.NewVhostHandler(p, logger, themeInst)
 		if len(errs) > 0 {
 			return nil, errs
 		}
diff --git a/src/serverHandler/aliasHandler.go b/src/serverHandler/aliasHandler.go
@@ -4,7 +4,7 @@ import (
 	"mjpclab.dev/ghfs/src/middleware"
 	"mjpclab.dev/ghfs/src/param"
 	"mjpclab.dev/ghfs/src/serverLog"
-	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/tpl/theme"
 	"mjpclab.dev/ghfs/src/user"
 	"net/http"
 	"regexp"
@@ -22,7 +22,7 @@ type pathStrings struct {
 
 type aliasParam struct {
 	users  user.List
-	theme  tpl.Theme
+	theme  theme.Theme
 	logger *serverLog.Logger
 
 	shows     *regexp.Regexp
@@ -56,7 +56,7 @@ type aliasHandler struct {
 	aliasPrefix   string
 
 	users  user.List
-	theme  tpl.Theme
+	theme  theme.Theme
 	logger *serverLog.Logger
 
 	shows     *regexp.Regexp
diff --git a/src/serverHandler/page.go b/src/serverHandler/page.go
@@ -4,7 +4,7 @@ import (
 	"html/template"
 	"mjpclab.dev/ghfs/src/acceptHeaders"
 	"mjpclab.dev/ghfs/src/i18n"
-	tplutil "mjpclab.dev/ghfs/src/tpl/util"
+	tplUtil "mjpclab.dev/ghfs/src/tpl/util"
 	"mjpclab.dev/ghfs/src/util"
 	"net/http"
 )
@@ -18,22 +18,22 @@ func updateSubItemsHtml(data *responseData) {
 
 	for i, info := range data.SubItems {
 		name := info.Name()
-		urlEscapedName := tplutil.FormatFileUrl(name)
+		urlEscapedName := tplUtil.FormatFileUrl(name)
 
 		var displayName template.HTML
 		var typ template.HTML
 		var url string
 		var readableSize template.HTML
 
 		if info.IsDir() {
-			displayName = tplutil.FormatFilename(name) + "/"
+			displayName = tplUtil.FormatFilename(name) + "/"
 			typ = TypeDir
 			url = data.SubItemPrefix + urlEscapedName + "/" + data.Context.QueryString()
 		} else {
-			displayName = tplutil.FormatFilename(name)
+			displayName = tplUtil.FormatFilename(name)
 			typ = TypeFile
 			url = data.SubItemPrefix + urlEscapedName + data.Context.FileQueryString()
-			readableSize = tplutil.FormatSize(info.Size())
+			readableSize = tplUtil.FormatSize(info.Size())
 		}
 
 		var deleteUrl string
@@ -46,7 +46,7 @@ func updateSubItemsHtml(data *responseData) {
 			Url:         url,
 			DisplayName: displayName,
 			DisplaySize: readableSize,
-			DisplayTime: tplutil.FormatTime(info.ModTime()),
+			DisplayTime: tplUtil.FormatTime(info.ModTime()),
 			DeleteUrl:   deleteUrl,
 		}
 	}
diff --git a/src/serverHandler/vhostHandler.go b/src/serverHandler/vhostHandler.go
@@ -4,7 +4,7 @@ import (
 	"mjpclab.dev/ghfs/src/param"
 	"mjpclab.dev/ghfs/src/serverError"
 	"mjpclab.dev/ghfs/src/serverLog"
-	"mjpclab.dev/ghfs/src/tpl"
+	"mjpclab.dev/ghfs/src/tpl/theme"
 	"mjpclab.dev/ghfs/src/user"
 	"net/http"
 	"strings"
@@ -13,7 +13,7 @@ import (
 func NewVhostHandler(
 	p *param.Param,
 	logger *serverLog.Logger,
-	theme tpl.Theme,
+	theme theme.Theme,
 ) (handler http.Handler, errs []error) {
 	// users
 	users := user.NewList(p.UserMatchCase)
diff --git a/src/tpl/asset.go b/src/tpl/asset.go
diff --git a/src/tpl/defaultTheme/defaultTheme.go b/src/tpl/defaultTheme/defaultTheme.go
@@ -1,8 +1,9 @@
-package tpl
+package defaultTheme
 
 import (
 	"bytes"
 	_ "embed"
+	"mjpclab.dev/ghfs/src/tpl/theme"
 )
 
 //go:embed frontend/index.html
@@ -17,19 +18,19 @@ var defaultCss []byte
 //go:embed frontend/index.js
 var defaultJs []byte
 
-var DefaultTheme MemTheme
+var DefaultTheme theme.MemTheme
 
 func init() {
-	defaultTpl, err := ParsePageTpl(defaultTplStr)
+	var err error
+
+	DefaultTheme.Template, err = theme.ParsePageTpl(defaultTplStr)
 	if err != nil {
-		defaultTpl, _ = ParsePageTpl("Builtin Template Error")
+		DefaultTheme.Template, _ = theme.ParsePageTpl("Builtin Template Error")
 	}
-	DefaultTheme.template = defaultTpl
 
-	defaultAssets := map[string]asset{
+	DefaultTheme.Assets = theme.Assets{
 		"favicon.ico": {"image/x-icon", bytes.NewReader(defaultFavicon)},
 		"index.css":   {"text/css", bytes.NewReader(defaultCss)},
 		"index.js":    {"application/javascript", bytes.NewReader(defaultJs)},
 	}
-	DefaultTheme.assets = defaultAssets
 }
diff --git a/src/tpl/defaultTheme/frontend/favicon.ico b/src/tpl/defaultTheme/frontend/favicon.ico
diff --git a/src/tpl/defaultTheme/frontend/index.css b/src/tpl/defaultTheme/frontend/index.css
diff --git a/src/tpl/defaultTheme/frontend/index.html b/src/tpl/defaultTheme/frontend/index.html
diff --git a/src/tpl/defaultTheme/frontend/index.js b/src/tpl/defaultTheme/frontend/index.js
diff --git a/src/tpl/theme/asset.go b/src/tpl/theme/asset.go
@@ -0,0 +1,29 @@
+package theme
+
+import (
+	"bytes"
+	"io"
+	"mjpclab.dev/ghfs/src/util"
+)
+
+type Asset struct {
+	ContentType string
+	ReadSeeker  io.ReadSeeker
+}
+
+type Assets map[string]Asset
+
+func (assets Assets) Set(path string, content []byte) error {
+	rd := bytes.NewReader(content)
+	ctype, err := util.GetContentType(path, rd)
+	if err != nil {
+		return err
+	}
+
+	asset := Asset{
+		ContentType: ctype,
+		ReadSeeker:  rd,
+	}
+	assets[path] = asset
+	return nil
+}
diff --git a/src/tpl/theme/dirTheme.go b/src/tpl/theme/dirTheme.go
@@ -1,4 +1,4 @@
-package tpl
+package theme
 
 import (
 	"io"
diff --git a/src/tpl/theme/memTheme.go b/src/tpl/theme/memTheme.go
@@ -1,4 +1,4 @@
-package tpl
+package theme
 
 import (
 	"archive/zip"
@@ -10,16 +10,16 @@ import (
 )
 
 type MemTheme struct {
-	template *template.Template
-	assets   assets
+	Template *template.Template
+	Assets   Assets
 }
 
 var initTime = time.Now()
 
 func LoadMemTheme(themePath string) (theme MemTheme, err error) {
 	var currentTheme = MemTheme{
-		template: nil,
-		assets:   make(assets, 2),
+		Template: nil,
+		Assets:   make(Assets, 3),
 	}
 
 	// assume to be a zip file
@@ -43,16 +43,16 @@ func LoadMemTheme(themePath string) (theme MemTheme, err error) {
 			return
 		}
 		if f.Name == templateFilename {
-			currentTheme.template, err = ParsePageTpl(string(raw))
+			currentTheme.Template, err = ParsePageTpl(string(raw))
 			if err != nil {
 				return
 			}
 		} else {
-			currentTheme.assets.set(f.Name, raw)
+			currentTheme.Assets.Set(f.Name, raw)
 		}
 	}
 
-	if currentTheme.template != nil {
+	if currentTheme.Template != nil {
 		theme = currentTheme
 		return
 	}
@@ -62,16 +62,16 @@ func LoadMemTheme(themePath string) (theme MemTheme, err error) {
 }
 
 func (theme MemTheme) RenderPage(w io.Writer, data interface{}) error {
-	return theme.template.Execute(w, data)
+	return theme.Template.Execute(w, data)
 }
 
 func (theme MemTheme) RenderAsset(w http.ResponseWriter, r *http.Request, assetPath string) {
-	asset, ok := theme.assets[assetPath]
+	asset, ok := theme.Assets[assetPath]
 	if !ok {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
 
-	w.Header().Set("Content-Type", asset.contentType)
-	http.ServeContent(w, r, assetPath, initTime, asset.readSeeker)
+	w.Header().Set("Content-Type", asset.ContentType)
+	http.ServeContent(w, r, assetPath, initTime, asset.ReadSeeker)
 }
diff --git a/src/tpl/theme/template.go b/src/tpl/theme/template.go
@@ -1,4 +1,4 @@
-package tpl
+package theme
 
 import (
 	"html/template"
diff --git a/src/tpl/theme/theme.go b/src/tpl/theme/theme.go
@@ -1,4 +1,4 @@
-package tpl
+package theme
 
 import (
 	"io"
