From 245ebce688093181dc0f2c757fe25dee922e4a5c Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 1 Aug 2025 01:37:16 -0400 Subject: [PATCH] Now we have working templates that match what I have in Fiber and can process either .html or .md files. --- example/layouts/main/index.html | 0 example/pages/subdir/md_test.md | 3 ++ example/pages/subdir/sub_test.html | 1 + example/ssgod.toml | 6 +-- main.go | 75 ++++++++++++++++++++++-------- 5 files changed, 62 insertions(+), 23 deletions(-) delete mode 100644 example/layouts/main/index.html create mode 100644 example/pages/subdir/md_test.md create mode 100644 example/pages/subdir/sub_test.html diff --git a/example/layouts/main/index.html b/example/layouts/main/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/example/pages/subdir/md_test.md b/example/pages/subdir/md_test.md new file mode 100644 index 0000000..a848a32 --- /dev/null +++ b/example/pages/subdir/md_test.md @@ -0,0 +1,3 @@ +# Hi there + +I'm in a subdirectory. diff --git a/example/pages/subdir/sub_test.html b/example/pages/subdir/sub_test.html new file mode 100644 index 0000000..12c96b8 --- /dev/null +++ b/example/pages/subdir/sub_test.html @@ -0,0 +1 @@ +

I'm in a subdirectory.

diff --git a/example/ssgod.toml b/example/ssgod.toml index f0b83c3..e316621 100644 --- a/example/ssgod.toml +++ b/example/ssgod.toml @@ -1,3 +1,3 @@ -views = "./pages" -layout = "layouts/main" -target = "./public" +views = "pages" +layout = "pages/layouts/main.html" +target = "public" diff --git a/main.go b/main.go index 743ebe8..31e75ce 100644 --- a/main.go +++ b/main.go @@ -3,12 +3,13 @@ package main import ( "log" "fmt" + "bytes" "strings" "io/fs" + "io" "path/filepath" "os" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/template/html/v2" + "text/template" "zedshaw.games/ssgod/config" "github.com/yuin/goldmark" ) @@ -19,33 +20,66 @@ func Fail(err error, format string, v ...any) error { return err } -func RenderMarkdown(target_path string, ext string, path string) error { - // need to strip the .md and replace with .html - html_name, _ := strings.CutSuffix(target_path, ext) - html_name = fmt.Sprintf("%s.html", html_name) +func RenderTemplate(out io.Writer, embed string, variables any) (error) { + layout_path := config.Settings.Layout - log.Printf("MARKDOWN: %s -> %s", path, html_name) + layout_main, err := os.ReadFile(layout_path) - out, err := os.OpenFile(html_name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) + if err != nil { + return Fail(err, "can't read your layout file: %s", layout_path) + } + + tmpl := template.New(layout_path) + + callbacks := template.FuncMap{ + "embed": func() string { return embed }, + } + tmpl.Funcs(callbacks) + + tmpl, err = tmpl.Parse(string(layout_main)) + if err != nil { return Fail(err, "can't parse %s", layout_path) } + + err = tmpl.Execute(out, variables) + + return err +} + +func RenderMarkdown(path string, target_path string, page_id string) error { + log.Printf("MARKDOWN: %s -> %s", path, target_path) + + out, err := os.OpenFile(target_path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) defer out.Close() if err != nil { return Fail(err, "writing file %s", target_path) } input_data, err := os.ReadFile(path) - err = goldmark.Convert(input_data, out) + var md_out bytes.Buffer + + err = goldmark.Convert(input_data, &md_out) + if err != nil { return Fail(err, "failed converting markdown %s", path) } + + err = RenderTemplate(out, md_out.String(), + map[string]string{"PageId": page_id}) + + if err != nil { return Fail(err, "failed to render template %s->%s", path, target_path) } return err; } -func RenderHTML(engine *html.Engine, source_name string, target_path string, page_id string) error { - log.Printf("RENDER: %s -> %s", source_name, target_path) +func RenderHTML(source_path string, target_path string, page_id string) error { + log.Printf("RENDER: %s -> %s", source_path, target_path) out, err := os.OpenFile(target_path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) defer out.Close() + html_content, err := os.ReadFile(source_path) + if err != nil { return Fail(err, "cannot open html input %s", source_path) } + + err = RenderTemplate(out, string(html_content), + map[string]string{"PageId": page_id}) + if err != nil { return Fail(err, "writing file %s", target_path) } - err = engine.Render(out, source_name, fiber.Map{"PageId": page_id}, config.Settings.Layout) return err; } @@ -79,7 +113,7 @@ func RePrefixPath(path string, new_prefix string) string { return filepath.Join(prefixed_path...) } -func ProcessDirEntry(engine *html.Engine, path string, d fs.DirEntry, err error) error { +func ProcessDirEntry(path string, d fs.DirEntry, err error) error { settings := config.Settings if !d.IsDir() { @@ -87,7 +121,7 @@ func ProcessDirEntry(engine *html.Engine, path string, d fs.DirEntry, err error) source_name, ext, found := SplitPathExt(path) - if found && source_name != settings.Layout { + if found && path != settings.Layout { target_path := RePrefixPath(path, settings.Target) err = MkdirPath(target_path) @@ -97,11 +131,15 @@ func ProcessDirEntry(engine *html.Engine, path string, d fs.DirEntry, err error) page_id := strings.ReplaceAll(source_name, "/", "-") + "-page" if ext == ".html" { - err = RenderHTML(engine, source_name, target_path, page_id) + err = RenderHTML(path, target_path, page_id) if err != nil { return Fail(err, "failed to render %s", path) } } else if ext == ".md" { - RenderMarkdown(target_path, ext, path) + // need to strip the .md and replace with .html + html_name, _ := strings.CutSuffix(target_path, ext) + html_name = fmt.Sprintf("%s.html", html_name) + + RenderMarkdown(path, html_name, page_id) if err != nil { return Fail(err, "failed to render markdown %s", path) } } @@ -112,12 +150,9 @@ func ProcessDirEntry(engine *html.Engine, path string, d fs.DirEntry, err error) } func RenderPages() { - engine := html.New(config.Settings.Views, ".html") - engine.Load() - err := filepath.WalkDir(config.Settings.Views, func (path string, d fs.DirEntry, err error) error { - return ProcessDirEntry(engine, path, d, err) + return ProcessDirEntry(path, d, err) }) if err != nil { log.Fatalf("can't walk content") }