diff options
| -rw-r--r-- | backend/parser.go | 21 | ||||
| -rw-r--r-- | backend/templates/components.html | 2 | ||||
| -rw-r--r-- | backend/templates/data.html | 2 |
3 files changed, 8 insertions, 17 deletions
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 diff --git a/backend/templates/components.html b/backend/templates/components.html index d9a653f..b4ffbe6 100644 --- a/backend/templates/components.html +++ b/backend/templates/components.html @@ -7,7 +7,7 @@ <a href="/{{ $uri }}/{{ .Slug }}"><img src="{{ static .Img.Src }}" alt="{{ .Img.Alt }}" /></a> <figcaption>{{ .Img.Legend }}</figcaption> </figure> - {{ .Description }} + <p>{{ .Description }}</p> </article> {{ end }} <div class="pagination"> diff --git a/backend/templates/data.html b/backend/templates/data.html index 6fe15c4..a384459 100644 --- a/backend/templates/data.html +++ b/backend/templates/data.html @@ -1,7 +1,7 @@ {{define "body"}} <article id="content"> <h1>{{ .DataTitle }}</h1> - {{ .Description }} + <p>{{ .Description }}</p> <figure> <img src="{{ static .Img.Src }}" alt="{{ .Img.Alt }}" class="large" /> <figcaption>{{ .Img.Legend }}</figcaption> |