From 90246ee314cfbb6b6f0b43b51e392b6b5293b867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Fri, 19 Dec 2025 13:04:08 +0100 Subject: Revert "feat(backend): parse description as markdown" This reverts commit 0c0c6fb6df755d8f53d353e8b941e22a6c474b60. --- backend/parser.go | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'backend/parser.go') diff --git a/backend/parser.go b/backend/parser.go index 8dba673..f2537d5 100644 --- a/backend/parser.go +++ b/backend/parser.go @@ -3,7 +3,6 @@ package backend import ( "errors" "fmt" - "html" "html/template" "log/slog" "strings" @@ -15,7 +14,7 @@ import ( type EntryInfo struct { Title string `toml:"title"` - Description template.HTML `toml:"description"` + Description string `toml:"description"` Img image `toml:"image"` PubLocalDate toml.LocalDate `toml:"publication_date"` } @@ -39,37 +38,29 @@ func renderLink(content, href, url string) template.HTML { } func parse(b []byte, info *EntryInfo, d *data) (template.HTML, bool) { - opt := defaultMarkdownOption - opt.RenderLink = renderLinkFunc(d.URL) - var dd string - var err error splits := strings.SplitN(string(b), "---", 2) if len(splits) == 2 && info != nil { - err = toml.Unmarshal([]byte(splits[0]), info) + err := toml.Unmarshal([]byte(splits[0]), info) if err != nil { slog.Warn("parsing entry info", "error", err) } else { - info.Description, err = markdown.Parse(string(info.Description), &opt) dd = splits[1] } } else { dd = string(b) } - + opt := defaultMarkdownOption + opt.RenderLink = renderLinkFunc(d.URL) + content, err := markdown.Parse(dd, &opt) var errMd *markdown.ParseError errors.As(err, &errMd) - var content template.HTML - if errMd == nil { - content, err = markdown.Parse(dd, &opt) - errors.As(err, &errMd) - } if errMd != nil { slog.Error("parsing markdown") fmt.Println(errMd.Pretty()) return "", false } - d.PageDescription = html.UnescapeString(string(info.Description)) + d.PageDescription = info.Description d.title = info.Title d.Image = info.Img.Src return content, true -- cgit v1.2.3