chore: mv asset

cmd/eiblog/config/config.go

@@ -14,8 +14,8 @@ import (
 var (
 	// Conf 配置
 	Conf Config
-	// WorkDir 工作目录
+	// EtcDir 工作目录
-	WorkDir string
+	EtcDir string
 )
 
 // Config config
@@ -50,11 +50,11 @@ func init() {
 
 	// 加载配置文件
 	var err error
-	WorkDir, err = config.WalkWorkDir()
+	EtcDir, err = config.WorkEtcPath()
 	if err != nil {
 		panic(err)
 	}
-	path := filepath.Join(WorkDir, "etc", "app.yml")
+	path := filepath.Join(EtcDir, "app.yml")
 
 	data, err := os.ReadFile(path)
 	if err != nil {

cmd/eiblog/handler/file/timer.go

@@ -16,7 +16,7 @@ import (
 var xmlTmpl *template.Template
 
 func init() {
-	root := filepath.Join(config.WorkDir, "website", "template", "*.xml")
+	root := filepath.Join(config.EtcDir, "template", "*.xml")
 
 	var err error
 	xmlTmpl, err = template.New("").Funcs(template.FuncMap{

cmd/eiblog/handler/page/page.go

@@ -17,17 +17,10 @@ var htmlTmpl *template.Template
 
 func init() {
 	htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap)
-	root := filepath.Join(config.WorkDir, "website")
+	root := filepath.Join(config.EtcDir, "website")
 	files := tools.ReadDirFiles(root, func(fi fs.DirEntry) bool {
-		name := fi.Name()
+		// should not read dir & .DS_Store
-		if strings.HasPrefix(name, ".") {
+		return strings.HasPrefix(fi.Name(), ".") || fi.IsDir()
-			return true
-		}
-		// should not read template dir
-		if fi.IsDir() && name == "template" {
-			return true
-		}
-		return false
 	})
 	_, err := htmlTmpl.ParseFiles(files...)
 	if err != nil {

cmd/eiblog/main.go

@@ -43,7 +43,7 @@ func runHTTPServer(endRun chan error) {
 	swag.RegisterRoutes(e)
 
 	// static files, page
-	e.Static("/static", filepath.Join(config.WorkDir, "assets"))
+	e.Static("/static", filepath.Join(config.EtcDir, "assets"))
 
 	// static files
 	file.RegisterRoutes(e)

pkg/config/config.go

@@ -26,25 +26,26 @@ func (mode RunMode) IsRunMode() bool {
 	return mode == RunModeDev || mode == RunModeProd || mode == RunModeLocal
 }
 
-// WalkWorkDir walk work dir
+// WorkEtcPath walk etc dir
-func WalkWorkDir() (string, error) {
+func WorkEtcPath() (string, error) {
 	gopath := os.Getenv("GOPATH")
-	workDir, err := os.Getwd()
+	wd, err := os.Getwd()
 	if err != nil {
 		return "", err
 	}
-	// find work dir, try 3 times
+	// find etc path, try 3 times
-	for gopath != workDir && workDir != "/" {
+	var etc string
-		dir := filepath.Join(workDir, "etc")
+	for gopath != wd && wd != "/" {
+		etc = filepath.Join(wd, "etc")
 
-		_, err := os.Stat(dir)
+		_, err := os.Stat(etc)
 		if err == nil {
 			break
 		}
 		if !os.IsNotExist(err) {
 			return "", err
 		}
-		workDir = filepath.Dir(workDir)
+		wd = filepath.Dir(wd)
 	}
-	return workDir, nil
+	return etc, nil
 }