From 44cc5d5677bb6c4f6dfea3424326047d355370f2 Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:48:00 +0800 Subject: [PATCH 1/2] fix if cfg.Pages.StaticDir is "" issue --- main.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 48c10fe..5f5b3ed 100644 --- a/main.go +++ b/main.go @@ -234,8 +234,18 @@ func setupPages(cfg *config.Config, r *touka.Engine) { } case "external": - r.SetUnMatchFS(http.Dir(cfg.Pages.StaticDir)) - + if cfg.Pages.StaticDir == "" { + logger.Errorf("Pages Mode is 'external' but StaticDir is empty. Using embedded pages instead.") + err := setInternalRoute(cfg, r) + if err != nil { + logger.Errorf("Failed to load embedded pages: %s", err) + fmt.Printf("Failed to load embedded pages: %s", err) + os.Exit(1) + } + } else { + extPageFS := os.DirFS(cfg.Pages.StaticDir) + r.SetUnMatchFS(http.FS(extPageFS)) + } default: // 处理无效的Pages Mode logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode) From a2857772174c9de535c069a38e150fb1190d8fd1 Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:53:09 +0800 Subject: [PATCH 2/2] 4.3.2 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb222e3..c46007d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 更新日志 +4.3.2 - 2025-08-20 +--- +- FIX: 修正`cfg.Pages.StaticDir`为空时的处置 + 4.3.1 - 2025-08-13 --- - CHANGE: 更新至[Go 1.25](https://tip.golang.org/doc/go1.25) diff --git a/VERSION b/VERSION index ecedc98..7e961f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.1 \ No newline at end of file +4.3.2 \ No newline at end of file