ficd/zona-go
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added proper frontmatter struct

Browse source
This commit is contained in:
Daniel Fichtinger 2025-05-03 00:17:34 -04:00
parent 99bc128578
commit 3355bc5544
2 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
internal/builder/build_page.go
View file

@ -30,7 +30,16 @@ type PageData struct {
type Metadata map[string]any type Metadata map[string]any
func processWithYaml(f []byte) (Metadata, []byte, error) { type FrontMatter struct {
Title string `yaml:"title"`
Icon string `yaml:"icon"`
Style string `yaml:"style"`
Header string `yaml:"header"`
Footer string `yaml:"footer"`
Type string `yaml:"type"`
}
func processWithYaml(f []byte) (*FrontMatter, []byte, error) {
// Check if the file has valid metadata // Check if the file has valid metadata
trimmed := bytes.TrimSpace(f) trimmed := bytes.TrimSpace(f)
normalized := strings.ReplaceAll(string(trimmed), "\r\n", "\n") normalized := strings.ReplaceAll(string(trimmed), "\r\n", "\n")
@ -43,23 +52,23 @@ func processWithYaml(f []byte) (Metadata, []byte, error) {
if len(split) < 3 { if len(split) < 3 {
return nil, nil, fmt.Errorf("invalid frontmatter format") return nil, nil, fmt.Errorf("invalid frontmatter format")
} }
var meta Metadata var meta FrontMatter
// Parse YAML // Parse YAML
if err := yaml.Unmarshal([]byte(split[1]), &meta); err != nil { if err := yaml.Unmarshal([]byte(split[1]), &meta); err != nil {
return nil, nil, err return nil, nil, err
} }
return meta, []byte(split[2]), nil return &meta, []byte(split[2]), nil
} }
func buildPageData(m Metadata, in string, out string, settings *Settings) *PageData { func buildPageData(m *FrontMatter, in string, out string, settings *Settings) *PageData {
p := &PageData{} p := &PageData{}
if title, ok := m["title"].(string); ok { if m != nil && m.Title != "" {
p.Title = util.WordsToTitle(title) p.Title = util.WordsToTitle(m.Title)
} else { } else {
p.Title = util.PathToTitle(in) p.Title = util.PathToTitle(in)
} }
if icon, ok := m["icon"].(string); ok { if m != nil && m.Icon != "" {
i, err := util.NormalizePath(icon, in) i, err := util.NormalizePath(m.Icon, in)
if err != nil { if err != nil {
p.Icon = settings.IconName p.Icon = settings.IconName
} else { } else {
@ -69,8 +78,8 @@ func buildPageData(m Metadata, in string, out string, settings *Settings) *PageD
p.Icon = settings.IconName p.Icon = settings.IconName
} }
var stylePath string var stylePath string
if style, ok := m["style"].(string); ok { if m != nil && m.Style != "" {
stylePath = style stylePath = m.Style
} else { } else {
stylePath = settings.StylePath stylePath = settings.StylePath
} }
@ -81,23 +90,24 @@ func buildPageData(m Metadata, in string, out string, settings *Settings) *PageD
log.Fatalln("Error calculating stylesheet path: ", err) log.Fatalln("Error calculating stylesheet path: ", err)
} }
p.Stylesheet = relPath p.Stylesheet = relPath
if header, ok := m["header"].(string); ok {
p.HeaderName = header if m != nil && m.Header != "" {
p.HeaderName = m.Header
// for now we use default anyways // for now we use default anyways
p.Header = settings.Header p.Header = settings.Header
} else { } else {
p.HeaderName = settings.HeaderName p.HeaderName = settings.HeaderName
p.Header = settings.Header p.Header = settings.Header
} }
if footer, ok := m["footer"].(string); ok { if m != nil && m.Footer != "" {
p.FooterName = footer p.FooterName = m.Footer
p.Footer = settings.Footer p.Footer = settings.Footer
} else { } else {
p.FooterName = settings.FooterName p.FooterName = settings.FooterName
p.Footer = settings.Footer p.Footer = settings.Footer
} }
// TODO: Don't hard code posts dir name // TODO: Don't hard code posts dir name
if t, ok := m["type"].(string); util.InDir(in, "posts") && !ok || (ok && t == "article" || t == "post") { if (m != nil && (m.Type == "article" || m.Type == "post")) || util.InDir(in, "posts") {
p.Template = (settings.ArticleTemplate) p.Template = (settings.ArticleTemplate)
p.Type = "post" p.Type = "post"
} else { } else {

6
internal/builder/frontmatter.go
View file

@ -10,17 +10,17 @@ import (
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
func processFrontmatter(p string) (Metadata, int, error) { func processFrontmatter(p string) (*FrontMatter, int, error) {
f, l, err := readFrontmatter(p) f, l, err := readFrontmatter(p)
if err != nil { if err != nil {
return nil, l, err return nil, l, err
} }
var meta Metadata var meta FrontMatter
// Parse YAML // Parse YAML
if err := yaml.Unmarshal(f, &meta); err != nil { if err := yaml.Unmarshal(f, &meta); err != nil {
return nil, l, fmt.Errorf("yaml frontmatter could not be parsed: %w", err) return nil, l, fmt.Errorf("yaml frontmatter could not be parsed: %w", err)
} }
return meta, l, nil return &meta, l, nil
} }
// readFrontmatter reads the file at `path` and scans // readFrontmatter reads the file at `path` and scans