chore: change logrus to slog

Signed-off-by: Young Xu <xuthus5@gmail.com>

cmd.go

@@ -40,6 +40,6 @@ func init() {
 func main() {
 	err := rootCmd.Execute()
 	if err != nil {
-		logger.Fatal(err)
+		logger.Error("execute command failed", "reason", err)
 	}
 }

config.go

@@ -90,11 +90,11 @@ func (c *Config) load() error {
 	}
 	configBuffer, err := os.ReadFile(file)
 	if err != nil {
-		logger.Errorf("read config file failed: %v", err)
+		logger.Error("read config file failed", "reason", err)
 		return err
 	}
 	if err := yaml.Unmarshal(configBuffer, c); err != nil {
-		logger.Errorf("read config file failed: %v", err)
+		logger.Error("read config file failed", "reason", err)
 		return err
 	}
 	return nil
@@ -103,8 +103,8 @@ func (c *Config) load() error {
 type DeployType string
 
 const (
-	GitDeploy   DeployType = "git"
-	UpyunDeploy DeployType = "upyun"
+	GitHubDeploy DeployType = "github"
+	UpyunDeploy  DeployType = "upyun"
 )
 
 type Deploy struct {

deploy_command.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/spf13/cobra"
 	"strings"
+
+	"github.com/spf13/cobra"
 )
 
 func deployCmd() *cobra.Command {
@@ -12,46 +13,51 @@ func deployCmd() *cobra.Command {
 		Use:     "deploy",
 		Aliases: []string{"d"},
 		Short:   "deploy project to upyun",
-		PreRun: func(cmd *cobra.Command, args []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if path != "" {
 				BaseDir = strings.TrimSuffix(path, "/")
 			}
 
 			if err := outter.loadConfig(); err != nil {
-				logger.Fatalf("load config failed: %v", err)
+				logger.Error("load config failed", "reason", err)
+				return err
 			}
 			config := outter.Config.Deploy
 			switch config.Type {
 			case UpyunDeploy:
 				if !isCommandExist("upx") {
 					if err := goInstall("github.com/upyun/upx/cmd/upx"); err != nil {
-						logger.Errorf("install upx failed: %+v", err)
-						return
+						logger.Error("install upx failed", "reason", err)
+						return err
 					}
 				}
-			case GitDeploy:
+			case GitHubDeploy:
 			}
 
 			// generate source
 			if err := generateCmd().Execute(); err != nil {
-				logger.Errorf("generate project failed: %v", err)
-				return
+				logger.Error("generate project failed", "reason", err)
+				return err
 			}
+
+			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			config := outter.Config.Deploy
 			switch config.Type {
 			case UpyunDeploy:
 				if config.UpyunAuth == "" {
-					logger.Errorf("please config upyun auth string: upx auth [bucket] [operator] [password]")
+					logger.Error("please config upyun auth string: upx auth [bucket] [operator] [password]")
 					return
 				}
 				if err := uploadToUpyun(config.UpyunAuth, path); err != nil {
-					logger.Errorf("upload dist to upyun failed: %v", err)
+					logger.Error("upload dist to upyun failed", "reason", err)
 					return
 				}
-				logger.Infof("deploy to upyun success")
+				logger.Info("deploy to upyun success")
+			case GitHubDeploy:
 			}
+
 		},
 	}
 	cmd.Flags().StringVar(&path, "path", ".", "mder project path")

generate_command.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"math"
 	"os"
@@ -17,6 +16,8 @@ import (
 	"github.com/yuin/goldmark/parser"
 	"github.com/yuin/goldmark/text"
 	"go.abhg.dev/goldmark/toc"
+
+	"gitter.top/mder/mder/internal"
 )
 
 func generateCmd() *cobra.Command {
@@ -27,35 +28,39 @@ func generateCmd() *cobra.Command {
 		Use:     "generate",
 		Aliases: []string{"g"},
 		Short:   "generate project to dist folder",
-		PreRun: func(cmd *cobra.Command, args []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if path != "" {
 				BaseDir = strings.TrimSuffix(path, "/")
 			}
 			startAt = time.Now()
 			// 读取配置文件
 			if err := outter.loadConfig(); err != nil {
-				logger.Fatalf("load config file failed: %v", err)
+				logger.Error("load config file failed", "reason", err)
+				return err
 			}
+			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			// 读取资源文件
-			if err := outter.readDataSource(); err != nil {
-				logger.Errorf("read data source failed: %v", err)
+			dataSource, err := internal.GetDataSource(BaseDir)
+			if err != nil {
+				logger.Error("get data source failed", "reason", err)
 				return
 			}
+			outter.DataSource = dataSource
 			// 读取主题模板文件
 			if err := outter.readTheme(outter.Config.Site.Theme); err != nil {
-				logger.Errorf("read theme source failed: %v", err)
+				logger.Error("read theme source failed", "reason", err)
 				return
 			}
 			// 读取页面列表
 			if err := outter.readAllPages(); err != nil {
-				logger.Errorf("read page source failed: %v", err)
+				logger.Error("read page source failed", "reason", err)
 				return
 			}
 			// 读取文章列表
 			if err := outter.readAllPosts(); err != nil {
-				logger.Errorf("read post source failed: %v", err)
+				logger.Error("read post source failed", "reason", err)
 				return
 			}
 			// 数据写入模板文件
@@ -63,7 +68,7 @@ func generateCmd() *cobra.Command {
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			endAt := time.Since(startAt)
-			logger.Infof("generate used: %s", endAt.String())
+			logger.Info("generate success", "cost", endAt.String())
 		},
 	}
 	cmd.Flags().StringVar(&path, "path", ".", "mder project path")
@@ -75,14 +80,14 @@ func (o *Outter) readAllPosts() error {
 	var postDir = BaseDir + "/posts"
 	dirs, err := os.ReadDir(postDir)
 	if err != nil {
-		logger.Errorf("read directory failed: %v", err)
+		logger.Error("read directory failed", "reason", err)
 		return err
 	}
 	for _, info := range dirs {
 		// 获取文件信息
 		fsInfo, err := info.Info()
 		if err != nil {
-			logger.Errorf("read file info failed: %v", err)
+			logger.Error("read file info failed", "reason", err)
 			continue
 		}
 		// 不是目录 没有分类
@@ -95,7 +100,7 @@ func (o *Outter) readAllPosts() error {
 		}
 		post, err := o.readPost(fmt.Sprintf("%s/%s", postDir, info.Name()))
 		if err != nil {
-			logger.Errorf("read post file failed: %v", err)
+			logger.Error("read post file failed", "reason", err)
 			continue
 		}
 		post.UpdatedAtFormat = fsInfo.ModTime().Format(time.DateOnly)
@@ -119,7 +124,7 @@ func (o *Outter) readPost(fp string) (*Post, error) {
 	var post = new(Post)
 	content, err := os.ReadFile(fp)
 	if err != nil {
-		logger.Errorf("read file %s failed: %v", fp, err)
+		logger.Error("read file failed", "file", fp, "reason", err)
 		return nil, err
 	}
 	var buf bytes.Buffer
@@ -128,28 +133,28 @@ func (o *Outter) readPost(fp string) (*Post, error) {
 
 	tocTree, err := toc.Inspect(doc, content)
 	if err != nil {
-		logger.Errorf("read content toc tree failed: %v", err)
+		logger.Error("read content toc tree failed", "reason", err)
 		return nil, err
 	}
 
 	list := toc.RenderList(tocTree)
 	if list != nil {
 		if err := markdown.Renderer().Render(&buf, content, list); err != nil {
-			logger.Errorf("render toc content failed: %v", err)
+			logger.Error("render toc content failed", "reason", err)
 			return nil, err
 		}
 		post.TOC = buf.String()
 		buf.Reset()
 	}
 	if err := markdown.Renderer().Render(&buf, content, doc); err != nil {
-		logger.Errorf("render content failed: %v", err)
+		logger.Error("render content failed", "reason", err)
 		return nil, err
 	}
 
 	metaData := meta.Get(parserContext)
 	post.CreatedAt, err = datetimeStringToTime(mustString(metaData["date"]))
 	if err != nil {
-		logger.Errorf("get post %s created_at time failed, please check file content", post.FileBasename)
+		logger.Error("get post created_at time failed, please check file content", "name", post.FileBasename)
 		return nil, err
 	}
 	post.CreatedAtFormat = post.CreatedAt.Format("2006-01-02")
@@ -164,13 +169,13 @@ func (o *Outter) readPage(fp string) (*Page, error) {
 	var page = new(Page)
 	content, err := os.ReadFile(fp)
 	if err != nil {
-		logger.Errorf("read page file failed: %v", err)
+		logger.Error("read page file failed", "reason", err)
 		return nil, err
 	}
 	var buf bytes.Buffer
 	context := parser.NewContext()
 	if err := markdown.Convert(content, &buf, parser.WithContext(context)); err != nil {
-		logger.Errorf("render content failed: %v", err)
+		logger.Error("render content failed", "reason", err)
 		return nil, err
 	}
 	metaData := meta.Get(context)
@@ -183,7 +188,7 @@ func (o *Outter) readPosts(base, category string) []*Post {
 	var dir = fmt.Sprintf("%s/%s", base, category)
 	dirs, err := os.ReadDir(dir)
 	if err != nil {
-		logger.Errorf("read directory failed: %v", err)
+		logger.Error("read directory failed", "reason", err)
 		return nil
 	}
 	var posts []*Post
@@ -197,12 +202,12 @@ func (o *Outter) readPosts(base, category string) []*Post {
 		// 获取文件信息
 		fsInfo, err := info.Info()
 		if err != nil {
-			logger.Errorf("read file info failed: %v", err)
+			logger.Error("read file info failed", "reason", err)
 			return nil
 		}
 		post, err := o.readPost(fmt.Sprintf("%s/%s", dir, info.Name()))
 		if err != nil {
-			logger.Errorf("read post failed: %v", err)
+			logger.Error("read post failed", "reason", err)
 			continue
 		}
 		post.UpdatedAtFormat = fsInfo.ModTime().Format(time.DateOnly)
@@ -223,7 +228,7 @@ func (o *Outter) readAllPages() error {
 	var dir = BaseDir + "/pages"
 	dirs, err := os.ReadDir(dir)
 	if err != nil {
-		logger.Errorf("read directory failed: %v", err)
+		logger.Error("read directory failed", "reason", err)
 		return err
 	}
 	for _, info := range dirs {
@@ -235,7 +240,7 @@ func (o *Outter) readAllPages() error {
 		}
 		page, err := o.readPage(fmt.Sprintf("%s/%s", dir, info.Name()))
 		if err != nil {
-			logger.Errorf("read page file failed: %v", err)
+			logger.Error("read page file failed", "reason", err)
 			continue
 		}
 		page.Link = strings.ReplaceAll(info.Name(), ".md", "")
@@ -249,37 +254,37 @@ func (o *Outter) readTheme(themeName string) (err error) {
 	var dir = fmt.Sprintf("%s/themes/%s", BaseDir, themeName)
 	o.Theme.BaseLayout, err = os.ReadFile(fmt.Sprintf("%s/base.html", dir))
 	if err != nil {
-		logger.Errorf("read base.html theme file failed: %v", err)
+		logger.Error("read base.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.IndexLayout, err = os.ReadFile(fmt.Sprintf("%s/index.html", dir))
 	if err != nil {
-		logger.Errorf("read index.html theme file failed: %v", err)
+		logger.Error("read index.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.PageLayout, err = os.ReadFile(fmt.Sprintf("%s/page.html", dir))
 	if err != nil {
-		logger.Errorf("read page.html theme file failed: %v", err)
+		logger.Error("read page.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.PostLayout, err = os.ReadFile(fmt.Sprintf("%s/post.html", dir))
 	if err != nil {
-		logger.Errorf("read pose.html theme file failed: %v", err)
+		logger.Error("read pose.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.ArchiveLayout, err = os.ReadFile(fmt.Sprintf("%s/archive.html", dir))
 	if err != nil {
-		logger.Errorf("read archive.html theme file failed: %v", err)
+		logger.Error("read archive.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.TagLayout, err = os.ReadFile(fmt.Sprintf("%s/tag.html", dir))
 	if err != nil {
-		logger.Errorf("read tag.html theme file failed: %v", err)
+		logger.Error("read tag.html theme file failed", "reason", err)
 		return err
 	}
 	o.Theme.CategoryLayout, err = os.ReadFile(fmt.Sprintf("%s/category.html", dir))
 	if err != nil {
-		logger.Errorf("read category.html theme file failed: %v", err)
+		logger.Error("read category.html theme file failed", "reason", err)
 		return err
 	}
 
@@ -293,14 +298,14 @@ func (o *Outter) readTheme(themeName string) (err error) {
 }
 
 type Outter struct {
-	SourceVersion string                 // 资源号 防缓存
-	Config        *Config                // 全局配置
-	SourceData    map[string]interface{} // 记录source/data下的所有文件
-	Posts         []*Post                // 记录文章
-	DraftPosts    []*Post                // 不宜发布的草稿文章
-	Pages         []*Page                // 记录页面
-	Theme         *Theme                 // 记录主题模板文件
-	Now           time.Time              // 当前时间
+	SourceVersion string              // 资源号 防缓存
+	Config        *Config             // 全局配置
+	DataSource    internal.DataSource // 记录source/data下的所有文件
+	Posts         []*Post             // 记录文章
+	DraftPosts    []*Post             // 不宜发布的草稿文章
+	Pages         []*Page             // 记录页面
+	Theme         *Theme              // 记录主题模板文件
+	Now           time.Time           // 当前时间
 }
 
 type Theme struct {
@@ -352,47 +357,15 @@ func (o *Outter) loadConfig() error {
 	return o.Config.load()
 }
 
-// readDataSource 读取资源文件
-func (o *Outter) readDataSource() error {
-	o.SourceData = make(map[string]interface{})
-	var dataDir = BaseDir + "/data"
-	dirs, err := os.ReadDir(dataDir)
-	if err != nil {
-		return nil
-	}
-	for _, dir := range dirs {
-		if dir.IsDir() {
-			continue
-		}
-		// 不是json文件
-		if !strings.HasSuffix(dir.Name(), ".json") {
-			continue
-		}
-		var body []byte
-		body, err = os.ReadFile(fmt.Sprintf("%s/%s", dataDir, dir.Name()))
-		if err != nil {
-			logger.Errorf("read data source file failed: %v", err)
-			return err
-		}
-		var obj interface{}
-		if err := json.Unmarshal(body, &obj); err != nil {
-			logger.Errorf("unmarshal data source file failed: %v", err)
-			return err
-		}
-		o.SourceData[strings.ReplaceAll(dir.Name(), ".json", "")] = obj
-	}
-	return nil
-}
-
 // generate 文件生成
 func (o *Outter) generate() {
 	// 清理dist目录
 	if err := o.clearDistDirectory(); err != nil {
-		logger.Errorf("clear dist directory failed: %v", err)
+		logger.Error("clear dist directory failed", "reason", err)
 		return
 	}
 	if err := o.sourceCopy(); err != nil {
-		logger.Errorf("copy theme source to dist failed: %v", err)
+		logger.Error("copy theme source to dist failed", "reason", err)
 		return
 	}
 	_ = o.generateIndex()
@@ -407,12 +380,12 @@ func (o *Outter) generate() {
 // clearDistDirectory 清理dist目录
 func (o *Outter) clearDistDirectory() error {
 	if err := os.RemoveAll(BaseDir + "/dist"); err != nil {
-		logger.Errorf("remove old dist directory failed: %v", err)
+		logger.Error("remove old dist directory failed", "reason", err)
 		return err
 	}
 
 	if err := mkdir(BaseDir + "/dist"); err != nil {
-		logger.Errorf("create dist directory failed: %v", err)
+		logger.Error("create dist directory failed", "reason", err)
 		return err
 	}
 	return nil
@@ -427,31 +400,31 @@ func (o *Outter) sourceCopy() error {
 	jsDir := fmt.Sprintf("%s/js", destPath)
 	imagesDir := fmt.Sprintf("%s/images", destPath)
 	if err := mkdir(cssDir); err != nil {
-		logger.Errorf("mkdir css directory failed: %v", err)
+		logger.Error("mkdir css directory failed", "reason", err)
 		return err
 	}
 	if err := mkdir(jsDir); err != nil {
-		logger.Errorf("mkdir js directory failed: %v", err)
+		logger.Error("mkdir js directory failed", "reason", err)
 	}
 	if err := mkdir(imagesDir); err != nil {
-		logger.Errorf("mkdir images directory failed: %v", err)
+		logger.Error("mkdir images directory failed", "reason", err)
 	}
 	cmd := exec.Command("cp", "-r", sourcePath+"css", destPath)
 	if err := cmd.Run(); err != nil {
-		logger.Infof(cmd.String())
-		logger.Errorf("copy theme css source failed: %v", err)
+		logger.Info(cmd.String())
+		logger.Error("copy theme css source failed", "reason", err)
 		return err
 	}
 	cmd = exec.Command("cp", "-r", sourcePath+"js", destPath)
 	if err := cmd.Run(); err != nil {
-		logger.Infof(cmd.String())
-		logger.Errorf("copy theme js source failed: %v", err)
+		logger.Info(cmd.String())
+		logger.Error("copy theme js source failed", "reason", err)
 		return err
 	}
 	cmd = exec.Command("cp", "-r", sourcePath+"images", destPath)
 	if err := cmd.Run(); err != nil {
-		logger.Infof(cmd.String())
-		logger.Errorf("copy theme images source failed: %v", err)
+		logger.Info(cmd.String())
+		logger.Error("copy theme images source failed", "reason", err)
 		return err
 	}
 	return nil
@@ -469,7 +442,7 @@ func (o *Outter) generateIndex() error {
 
 	indexTemplate, err := indexTemplate.Parse(string(o.Theme.IndexLayout))
 	if err != nil {
-		logger.Errorf("parse index layout failed: %v", err)
+		logger.Error("parse index layout failed", "reason", err)
 		return err
 	}
 
@@ -480,21 +453,21 @@ func (o *Outter) generateIndex() error {
 	if !o.Config.PageConfig.Paginate {
 		err = indexTemplate.Execute(&buffer, o)
 		if err != nil {
-			logger.Errorf("generate index page failed: %v", err)
+			logger.Error("generate index page failed", "reason", err)
 			return err
 		}
 		var filename = BaseDir + "/dist/index.html"
 		if err := os.WriteFile(filename, buffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write index file failed: %v", err)
+			logger.Error("write index file failed", "reason", err)
 			return err
 		}
-		logger.Infof("index generate success...")
+		logger.Info("index generate success")
 		return nil
 	}
 
 	// 分页数据不规范
 	if o.Config.PageConfig.Size < 1 {
-		logger.Errorf("page size must > 1")
+		logger.Error("page size must > 1")
 		return err
 	}
 
@@ -514,7 +487,7 @@ func (o *Outter) generateIndex() error {
 
 		err = indexTemplate.Execute(&buffer, o)
 		if err != nil {
-			logger.Errorf("generate index page failed: %v", err)
+			logger.Error("generate index page failed", "reason", err)
 			return err
 		}
 		// 第一页 主页
@@ -522,18 +495,18 @@ func (o *Outter) generateIndex() error {
 			// 第一次的时候创建目录
 			dir := BaseDir + "/dist/page"
 			if err := o.createDir(dir); err != nil {
-				logger.Errorf("create index page failed: %v", err)
+				logger.Error("create index page failed", "reason", err)
 				return err
 			}
 			var filename = BaseDir + "/dist/index.html"
 			if err := os.WriteFile(filename, buffer.Bytes(), os.ModePerm); err != nil {
-				logger.Errorf("write index file failed: %v", err)
+				logger.Error("write index file failed", "reason", err)
 				return err
 			}
 		}
 		fPage := fmt.Sprintf(BaseDir+"/dist/page/%d.html", i+1)
 		if err := os.WriteFile(fPage, buffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write index file failed: %v", err)
+			logger.Error("write index file failed", "reason", err)
 			return err
 		}
 		buffer.Reset()
@@ -561,25 +534,25 @@ func (o *Outter) generatePost() {
 		postTemplate.Funcs(funcMap)
 		postTemplate, err := postTemplate.Parse(string(o.Theme.PostLayout))
 		if err != nil {
-			logger.Errorf("generate post page failed: %v", err)
+			logger.Error("generate post page failed", "reason", err)
 			return
 		}
 		// 入buffer
 		if err := postTemplate.Execute(postBuffer, instance); err != nil {
-			logger.Errorf("generate post page failed: %v", err)
+			logger.Error("generate post page failed", "reason", err)
 			return
 		}
 		// buffer写文件
 		var catDir = fmt.Sprintf(BaseDir+"/dist/%s", post.Category)
 		if !isExist(catDir) {
 			if err := mkdir(catDir); err != nil {
-				logger.Errorf("create directory failed: %v", err)
+				logger.Error("create directory failed", "reason", err)
 				return
 			}
 		}
 		var filename = fmt.Sprintf("%s/%s.html", catDir, post.FileBasename)
 		if err := os.WriteFile(filename, postBuffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write file failed: %v", err)
+			logger.Error("write file failed", "reason", err)
 			return
 		}
 		postBuffer.Reset()
@@ -604,25 +577,25 @@ func (o *Outter) generateDraftPost() {
 		postTemplate.Funcs(funcMap)
 		postTemplate, err := postTemplate.Parse(string(o.Theme.PostLayout))
 		if err != nil {
-			logger.Errorf("generate post page failed: %v", err)
+			logger.Error("generate post page failed", "reason", err)
 			return
 		}
 		// 入buffer
 		if err := postTemplate.Execute(postBuffer, instance); err != nil {
-			logger.Errorf("generate post page failed: %v", err)
+			logger.Error("generate post page failed", "reason", err)
 			return
 		}
 		// buffer写文件
 		var catDir = BaseDir + "/dist/draft"
 		if !isExist(catDir) {
 			if err := mkdir(catDir); err != nil {
-				logger.Errorf("create directory failed: %v", err)
+				logger.Error("create directory failed", "reason", err)
 				return
 			}
 		}
 		var filename = fmt.Sprintf("%s/%s.html", catDir, post.FileBasename)
 		if err := os.WriteFile(filename, postBuffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write file failed: %v", err)
+			logger.Error("write file failed", "reason", err)
 			return
 		}
 		postBuffer.Reset()
@@ -647,18 +620,18 @@ func (o *Outter) generatePage() {
 		pageTemplate.Funcs(funcMap)
 		pageTemplate, err := pageTemplate.Parse(string(o.Theme.PageLayout))
 		if err != nil {
-			logger.Errorf("generate page page failed: %v", err)
+			logger.Error("generate page page failed", "reason", err)
 			return
 		}
 		// 入buffer
 		if err := pageTemplate.Execute(pageBuffer, instance); err != nil {
-			logger.Errorf("generate page page failed: %v", err)
+			logger.Error("generate page page failed", "reason", err)
 			return
 		}
 		// buffer写文件
 		var filename = fmt.Sprintf(BaseDir+"/dist/%s.html", page.Link)
 		if err := os.WriteFile(filename, pageBuffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write page content failed: %v", err)
+			logger.Error("write page content failed", "reason", err)
 			return
 		}
 		pageBuffer.Reset()
@@ -706,19 +679,19 @@ func (o *Outter) generateArchives() {
 	archiveTemplate.Funcs(funcMap)
 	archiveTemplate, err := archiveTemplate.Parse(string(o.Theme.ArchiveLayout))
 	if err != nil {
-		logger.Errorf("generate archive page failed: %v", err)
+		logger.Error("generate archive page failed", "reason", err)
 		return
 	}
 
 	// 入buffer
 	if err := archiveTemplate.Execute(archiveBuffer, instance); err != nil {
-		logger.Errorf("generate archive page failed: %v", err)
+		logger.Error("generate archive page failed", "reason", err)
 		return
 	}
 	// buffer写文件
 	var filename = fmt.Sprintf(BaseDir+"/dist/%s.html", instance.Page.Link)
 	if err := os.WriteFile(filename, archiveBuffer.Bytes(), os.ModePerm); err != nil {
-		logger.Errorf("write archive page failed: %v", err)
+		logger.Error("write archive page failed", "reason", err)
 		return
 	}
 	archiveBuffer.Reset()
@@ -777,27 +750,27 @@ func (o *Outter) generateTags() {
 		tagsTemplate.Funcs(funcMap)
 		tagsTemplate, err := tagsTemplate.Parse(string(o.Theme.TagLayout))
 		if err != nil {
-			logger.Errorf("generate tags page failed: %v", err)
+			logger.Error("generate tags page failed", "reason", err)
 			return
 		}
 
 		// 入buffer
 		if err := tagsTemplate.Execute(tagsBuffer, instance); err != nil {
-			logger.Errorf("generate tags page failed: %v", err)
+			logger.Error("generate tags page failed", "reason", err)
 			return
 		}
 		// 创建tag文件夹
 		var tagDir = BaseDir + "/dist/tags"
 		if !isExist(tagDir) {
 			if err := mkdir(tagDir); err != nil {
-				logger.Errorf("create tag directory failed: %v", err)
+				logger.Error("create tag directory failed", "reason", err)
 				return
 			}
 		}
 		// buffer写文件
 		var filename = fmt.Sprintf("%s/%s.html", tagDir, instance.Page.Link)
 		if err := os.WriteFile(filename, tagsBuffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write tag content failed: %v", err)
+			logger.Error("write tag content failed", "reason", err)
 			return
 		}
 		tagsBuffer.Reset()
@@ -855,27 +828,27 @@ func (o *Outter) generateCategories() {
 		tagsTemplate.Funcs(funcMap)
 		tagsTemplate, err := tagsTemplate.Parse(string(o.Theme.TagLayout))
 		if err != nil {
-			logger.Errorf("generate tags page failed: %v", err)
+			logger.Error("generate tags page failed", "reason", err)
 			return
 		}
 
 		// 入buffer
 		if err := tagsTemplate.Execute(tagsBuffer, instance); err != nil {
-			logger.Errorf("generate tags page failed: %v", err)
+			logger.Error("generate tags page failed", "reason", err)
 			return
 		}
 		// 创建tag文件夹
 		var tagDir = BaseDir + "/dist/category"
 		if !isExist(tagDir) {
 			if err := mkdir(tagDir); err != nil {
-				logger.Errorf("create tag directory failed: %v", err)
+				logger.Error("create tag directory failed", "reason", err)
 				return
 			}
 		}
 		// buffer写文件
 		var filename = fmt.Sprintf("%s/%s.html", tagDir, instance.Page.Link)
 		if err := os.WriteFile(filename, tagsBuffer.Bytes(), os.ModePerm); err != nil {
-			logger.Errorf("write tag content failed: %v", err)
+			logger.Error("write tag content failed", "reason", err)
 			return
 		}
 		tagsBuffer.Reset()
@@ -903,7 +876,7 @@ type PostData struct {
 func (o *Outter) createDir(fp string) error {
 	if !isExist(fp) {
 		if err := mkdir(fp); err != nil {
-			logger.Errorf("create %s directory failed: %v", fp, err)
+			logger.Error("create directory failed", "dir", fp, "reason", err)
 			return err
 		}
 	}
@@ -916,12 +889,8 @@ var funcMap = template.FuncMap{
 	"sum":       sum,
 }
 
-func getSource(data interface{}, key string) interface{} {
-	source, ok := data.(map[string]interface{})
-	if !ok {
-		return nil
-	}
-	return source[key]
+func getSource(data internal.DataSource, key string) []*internal.DataItem {
+	return data[key]
 }
 
 func add(a, b int) int {

go.mod

@@ -1,49 +1,46 @@
 module gitter.top/mder/mder
 
-go 1.20
+go 1.24
 
 require (
-	github.com/gin-gonic/gin v1.9.1
-	github.com/guonaihong/gout v0.3.9
+	github.com/go-chi/chi/v5 v5.2.3
+	github.com/golang-cz/devslog v0.0.15
+	github.com/guonaihong/gout v0.3.11
 	github.com/radovskyb/watcher v1.0.7
-	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.8.0
-	github.com/yuin/goldmark v1.6.0
-	github.com/yuin/goldmark-emoji v1.0.2
+	github.com/samber/lo v1.52.0
+	github.com/spf13/cobra v1.10.2
+	github.com/yuin/goldmark v1.7.13
+	github.com/yuin/goldmark-emoji v1.0.6
 	github.com/yuin/goldmark-meta v1.1.0
-	go.abhg.dev/goldmark/mermaid v0.5.0
-	go.abhg.dev/goldmark/toc v0.9.0
+	go.abhg.dev/goldmark/mermaid v0.6.0
+	go.abhg.dev/goldmark/toc v0.12.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.10.2 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // 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.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.19 // 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.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
-	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

init_command.go

@@ -14,7 +14,7 @@ func initCmd() *cobra.Command {
 		Short: "create a new mder folder",
 		Run: func(cmd *cobra.Command, args []string) {
 			if name == "" && len(args) == 0 {
-				logger.Errorf("folder name empty")
+				logger.Error("folder name empty")
 				return
 			}
 			if name == "" && len(args) != 0 {
@@ -23,14 +23,14 @@ func initCmd() *cobra.Command {
 			var rule = fmt.Sprintf(`[A-Za-z0-9_]{%d}`, len([]rune(name)))
 			var reg = regexp.MustCompilePOSIX(rule)
 			if !reg.MatchString(name) {
-				logger.Errorf("folder name rule must be: %s", rule)
+				logger.Error("folder name rule must be: " + rule)
 				return
 			}
 			if err := cloneTemplate(name); err != nil {
-				logger.Errorf("clone template repository failed: %v", err)
+				logger.Error("clone template repository failed", "reason", err)
 				return
 			}
-			logger.Infof("create folder `%s` success", name)
+			logger.Info("create folder success", "folder", name)
 		},
 	}
 

internal/read_data.go

@@ -0,0 +1,47 @@
+package internal
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/samber/lo"
+)
+
+type DataItem struct {
+	Name string `yaml:"name"`
+	Link string `yaml:"link"`
+	Desc string `yaml:"desc"`
+}
+
+type DataSource map[string][]*DataItem
+
+// GetDataSource 读取数据目录 数据目录不支持嵌套读入
+func GetDataSource(dir string) (DataSource, error) {
+	dir = filepath.Join(dir, "data")
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return nil, err
+	}
+	var datasource = make(DataSource)
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		// 不是json文件
+		ext := filepath.Ext(entry.Name())
+		// 没有指定扩展名
+		if ext == "" {
+			continue
+		}
+		if !lo.Contains([]string{".yaml", ".yml"}, ext) {
+			continue
+		}
+		filename := entry.Name()[:len(entry.Name())-len(filepath.Ext(entry.Name()))]
+		dataItems, err := ReadYamlToDataItems(filepath.Join(dir, entry.Name()))
+		if err != nil {
+			panic("read data source file failed: " + err.Error())
+		}
+		datasource[filename] = dataItems
+	}
+	return datasource, nil
+}

internal/read_page.go

@@ -0,0 +1,25 @@
+package internal
+
+import "time"
+
+// Post 文章属性
+type Post struct {
+	Title           string    // 文章标题
+	FileBasename    string    // 文件名
+	Link            string    // 链接
+	Category        string    // 分类
+	CategoryAlias   string    // 分类别名
+	Tags            []string  // 标签
+	CreatedAt       time.Time // 创建时间
+	CreatedAtFormat string    // 创建时间格式化
+	UpdatedAtFormat string    // 更新时间
+	MD              string    // 文章内容
+	TOC             string    // 文章toc
+}
+
+// Page 页面属性
+type Page struct {
+	Title string // 展示名
+	Link  string // 链接名
+	MD    string // 页面内容
+}

internal/utils.go

@@ -0,0 +1,17 @@
+package internal
+
+import (
+	"os"
+
+	"gopkg.in/yaml.v3"
+)
+
+func ReadYamlToDataItems(filename string) ([]*DataItem, error) {
+	readFile, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	var dataItems []*DataItem
+	err = yaml.Unmarshal(readFile, &dataItems)
+	return dataItems, err
+}

logger.go

@@ -1,36 +1,29 @@
 package main
 
 import (
-	"bytes"
-	"fmt"
-	"strings"
+	"log/slog"
+	"os"
 
-	"github.com/sirupsen/logrus"
+	"github.com/golang-cz/devslog"
 )
 
-var logger = logrus.New()
+var logger *slog.Logger
 
 func init() {
-	logger.SetReportCaller(true)
-	logger.SetFormatter(&EasyFormatter{})
-}
-
-type EasyFormatter struct{}
-
-func (receiver *EasyFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	var output bytes.Buffer
-	output.WriteString(entry.Level.String()[:4])
-	output.WriteString("|")
-	var filenames = strings.Split(entry.Caller.File, "/")
-	filename := filenames[len(filenames)-1]
-	output.WriteString(fmt.Sprintf("%s:%d", filename, entry.Caller.Line))
-	output.WriteString("|")
-	output.WriteString(entry.Caller.Function)
-	output.WriteString("|")
-	for k, val := range entry.Data {
-		output.WriteString(fmt.Sprintf("%s=%v|", k, val))
+	slogOpts := &slog.HandlerOptions{
+		AddSource: true,
+		Level:     slog.LevelDebug,
 	}
-	output.WriteString(" " + entry.Message)
-	output.WriteRune('\n')
-	return output.Bytes(), nil
+	opts := &devslog.Options{
+		HandlerOptions:    slogOpts,
+		MaxSlicePrintSize: 4,
+		SortKeys:          true,
+		TimeFormat:        "[04:05]",
+		NewLineAfterLog:   true,
+		DebugColor:        devslog.Magenta,
+		StringerFormatter: true,
+	}
+
+	logger = slog.New(devslog.NewHandler(os.Stdout, opts))
+	slog.SetDefault(logger)
 }

new_command.go

@@ -23,7 +23,7 @@ func newCmd() *cobra.Command {
 }
 
 func newPostCmd() *cobra.Command {
-	var name string
+	var name, catalog string
 	cmd := &cobra.Command{
 		Use:   "post",
 		Short: "new a post",
@@ -39,28 +39,33 @@ func newPostCmd() *cobra.Command {
 				name = name + ".md"
 			}
 			filename := fmt.Sprintf("posts/%s", name)
+			if catalog != "" {
+				_name := strings.ReplaceAll(name, "/", "-")
+				filename = fmt.Sprintf("posts/%s/%s", catalog, _name)
+			}
 			// 检测文件夹是否存在
 			dir := filepath.Dir(filename)
 			if !isExist(dir) {
 				if err := mkdir(dir); err != nil {
-					logger.Errorf("make directory failed: %v", err)
+					logger.Error("make directory failed", "reason", err)
 					return
 				}
 			}
 			f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE, os.ModePerm)
 			if err != nil {
-				logger.Errorf("create file failed: %v", err)
+				logger.Error("create file failed", "reason", err)
 				return
 			}
 			defer f.Close()
-			var data = fmt.Sprintf("---\ntitle: %s\ndate: %s\ncatagories:\ntags:\n---", pureName, time.Now().Format("2006-01-02 15:04:05"))
+			var data = fmt.Sprintf("---\ntitle: %s\ndate: %s\ncatagories: %s\ntags:\n---", pureName, time.Now().Format("2006-01-02 15:04:05"), catalog)
 			if _, err := f.Write([]byte(data)); err != nil {
-				logger.Errorf("create file failed: %v", err)
+				logger.Error("create file failed", "reason", err)
 				return
 			}
 		},
 	}
-	cmd.Flags().StringVar(&name, "name", "uname.md", "Name of the post file to create")
+	cmd.Flags().StringVarP(&name, "name", "n", "uname.md", "Name of the post file to create")
+	cmd.Flags().StringVarP(&catalog, "catalog", "c", "develop", "Catalog of the post file to create")
 	return cmd
 }
 
@@ -82,19 +87,19 @@ func newPageCmd() *cobra.Command {
 			dir := filepath.Dir(filename)
 			if !isExist(dir) {
 				if err := mkdir(dir); err != nil {
-					logger.Errorf("make directory failed: %v", err)
+					logger.Error("make directory failed", "reason", err)
 					return
 				}
 			}
 			f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE, os.ModePerm)
 			if err != nil {
-				logger.Errorf("create file failed: %v", err)
+				logger.Error("create file failed", "reason", err)
 				return
 			}
 			defer f.Close()
 			var data = fmt.Sprintf("---\ntitle: %s\ndate: %s\n---", pureName, time.Now().Format("2006-01-02 15:04:05"))
 			if _, err := f.Write([]byte(data)); err != nil {
-				logger.Errorf("create file failed: %v", err)
+				logger.Error("create file failed", "reason", err)
 				return
 			}
 		},

serve_command.go

@@ -1,53 +1,81 @@
 package main
 
 import (
+	"errors"
 	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
+	"github.com/go-chi/chi/v5"
 	"github.com/radovskyb/watcher"
 	"github.com/spf13/cobra"
 )
 
+// FileServer conveniently sets up a http.FileServer handler to serve
+// static files from a http.FileSystem.
+func FileServer(r chi.Router, path string, root http.FileSystem) {
+	if strings.ContainsAny(path, "{}*") {
+		panic("FileServer does not permit any URL parameters.")
+	}
+
+	if path != "/" && path[len(path)-1] != '/' {
+		r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP)
+		path += "/"
+	}
+	path += "*"
+
+	r.Get(path, func(w http.ResponseWriter, r *http.Request) {
+		rctx := chi.RouteContext(r.Context())
+		pathPrefix := strings.TrimSuffix(rctx.RoutePattern(), "/*")
+		fs := http.StripPrefix(pathPrefix, http.FileServer(root))
+		fs.ServeHTTP(w, r)
+	})
+}
+
 func serveCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "serve",
-		Short: "run a serve locally",
+		Use:     "serve",
+		Short:   "run a serve locally",
+		Aliases: []string{"s"},
 		Run: func(cmd *cobra.Command, args []string) {
 			w := watcher.New()
 			w.SetMaxEvents(1)
 			w.FilterOps(watcher.Rename, watcher.Move, watcher.Write, watcher.Create)
 			if err := w.AddRecursive("./data"); err != nil {
-				logger.Errorf("watch directory data failed: %v", err)
+				logger.Error("watch directory data failed", "reason", err)
 				return
 			}
 			if err := w.AddRecursive("./posts"); err != nil {
-				logger.Errorf("watch directory posts failed: %v", err)
+				logger.Error("watch directory posts failed", "reason", err)
 				return
 			}
 			if err := w.AddRecursive("./pages"); err != nil {
-				logger.Errorf("watch directory pages failed: %v", err)
+				logger.Error("watch directory pages failed", "reason", err)
 				return
 			}
 			if err := w.AddRecursive("./themes"); err != nil {
-				logger.Errorf("watch directory pages failed: %v", err)
+				logger.Error("watch directory pages failed", "reason", err)
 				return
 			}
 			if err := w.Add("config.yaml"); err != nil {
-				logger.Errorf("watch file failed: %v", err)
+				logger.Error("watch file failed", "reason", err)
 				return
 			}
 			// start http server
-			gin.SetMode(gin.ReleaseMode)
-			router := gin.New()
-			router.Static("/", "./dist")
+			r := chi.NewRouter()
+			workDir, _ := os.Getwd()
+			filesDir := http.Dir(filepath.Join(workDir, "dist"))
+			FileServer(r, "/", filesDir)
+
 			server := http.Server{
 				Addr:    ":8666",
-				Handler: router,
+				Handler: r,
 			}
 			go func() {
-				if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-					logger.Errorf("listen server failed: %v", err)
+				if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+					logger.Error("listen server failed", "reason", err)
 				}
 			}()
 
@@ -57,12 +85,12 @@ func serveCmd() *cobra.Command {
 					case event := <-w.Event:
 						// 文件变更 更新文件
 						if err := generateCmd().Execute(); err != nil {
-							logger.Errorf("re generate website failed: %v", err)
+							logger.Error("re generate website failed", "reason", err)
 							return
 						}
-						logger.Infof("file change: %v", event.String())
+						logger.Info("file change", "event", event.String())
 					case err := <-w.Error:
-						logger.Errorf("watch file failed: %v", err)
+						logger.Error("watch file failed", "reason", err)
 					case <-w.Closed:
 						return
 					}
@@ -70,13 +98,13 @@ func serveCmd() *cobra.Command {
 			}()
 			// 先生成一次
 			if err := generateCmd().Execute(); err != nil {
-				logger.Errorf("generate website failed: %v", err)
+				logger.Error("generate website failed", "reason", err)
 				return
 			}
-			// 五秒一次
+			// 3秒一次
 			logger.Info("http://127.0.0.1:8666")
-			if err := w.Start(time.Second * 5); err != nil {
-				logger.Errorf("watch file failed: %v", err)
+			if err := w.Start(time.Second * 3); err != nil {
+				logger.Error("watch file failed", "reason", err)
 				return
 			}
 		},

update_command.go

@@ -14,20 +14,21 @@ func updateCmd() *cobra.Command {
 		Use:     "update",
 		Short:   "mder auto update",
 		Example: "mder update",
+		Aliases: []string{"u"},
 		Run: func(cmd *cobra.Command, args []string) {
 			commit, err := GetRepoLatestCommit()
 			if err != nil {
-				logger.Errorf("get mder version failed: %v", err)
+				logger.Error("get mder version failed", "reason", err)
 				return
 			}
-			logger.Infof("-----\nmder latest version: %s\n更新中...\n", commit.Sha)
+			logger.Info(fmt.Sprintf("-----\nmder latest version: %s\nupdating...\n", commit.Sha))
 			var url = fmt.Sprintf("gitter.top/mder/mder@%s", commit.Sha)
 			_, err = exec.Command("go", "install", url).CombinedOutput()
 			if err != nil {
-				logger.Errorf("install: go install %s\nupdate failed: %v\n", url, err)
+				logger.Error("install: go install %s\nupdate failed: %v\n", url, err)
 				return
 			}
-			logger.Infof("mder %s update success", commit.Sha)
+			logger.Info("mder update success", "hash", commit.Sha)
 		},
 	}