From a0cd6d7d582a76b75922008497960b35a012da00 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 12 Feb 2025 02:10:41 +0800 Subject: [PATCH] render_readme.go: Add org-mode support --- go.mod | 1 + go.sum | 2 ++ render_readme.go | 15 +++++++++++++++ diff --git a/go.mod b/go.mod index ad8f9fd264283640185c00d6e257f021592da6cc..14fe3929fa2c40f2a8decd187e22068119567d69 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ github.com/alecthomas/chroma/v2 v2.15.0 github.com/go-git/go-git/v5 v5.13.2 github.com/jackc/pgx/v5 v5.7.2 github.com/microcosm-cc/bluemonday v1.0.27 + github.com/niklasfasching/go-org v1.7.0 github.com/yuin/goldmark v1.7.8 go.lindenii.runxiyu.org/lindenii-common v0.0.0-20250211153243-8946fae17bd0 ) diff --git a/go.sum b/go.sum index 1a4b5e8675c0b9c96ac08547916b4c73473fcd4c..a02be3facd1b549f6cddc78166c2c5a2e6d2021e 100644 --- a/go.sum +++ b/go.sum @@ -69,6 +69,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA= +github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek= +github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= diff --git a/render_readme.go b/render_readme.go index 32a3a7de2b5c759b12a1fe48d32a1c3e54408975..497b3ec7fdaa84388c07e84732bf12e30f2da0a3 100644 --- a/render_readme.go +++ b/render_readme.go @@ -4,9 +4,11 @@ import ( "bytes" "html" "html/template" + "strings" "github.com/go-git/go-git/v5/plumbing/object" "github.com/microcosm-cc/bluemonday" + "github.com/niklasfasching/go-org/org" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" ) @@ -36,6 +38,19 @@ if err != nil { return "Error fetching README", string_escape_html("Unable to render README: " + err.Error()) } return "README.md", template.HTML(bluemonday.UGCPolicy().SanitizeBytes(readme_rendered_unsafe.Bytes())) + } + + readme_file, err = tree.File("README.org") + if err == nil { + readme_file_contents, err := readme_file.Contents() + if err != nil { + return "Error fetching README", string_escape_html("Unable to fetch contents of README: " + err.Error()) + } + org_html, err := org.New().Parse(strings.NewReader(readme_file_contents), readme_filename).Write(org.NewHTMLWriter()) + if err != nil { + return "Error fetching README", string_escape_html("Unable to render README: " + err.Error()) + } + return "README.org", template.HTML(bluemonday.UGCPolicy().Sanitize(org_html)) } return "", "" -- 2.48.1