ren/hugo-to-gemini
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #8

Browse source 
This fixes trailing newlines at the end of Gemtext being left.
This commit is contained in:
Timur Demin 2020-12-12 16:30:25 +05:00
parent d89c4b5e50
commit 7eaf6b7c8a
No known key found for this signature in database
GPG key ID: 9EDF3F9D9286FA20
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
render.go
View file

@ -48,7 +48,10 @@ func (h HugoMetadata) Date() time.Time {
return h.PostDate
}
var yamlDelimiter = []byte("---\n")
var (
yamlDelimiter = []byte("---\n")
trailing = []byte("\n\n")
)
// ErrPostIsDraft indicates the post rendered is a draft and is not
// supposed to be rendered.
@ -99,14 +102,20 @@ func RenderMarkdown(md []byte, settings Settings) (geminiText []byte, metadata H
md = md[blockEnd+len(yamlDelimiter)*2:]
parse:
ast := markdown.Parse(md, parser.NewWithExtensions(parser.CommonExtensions))
var geminiContent []byte
var content []byte
if settings.Has(WithMetadata) && metadata.PostTitle != "" {
geminiContent = markdown.Render(ast, gemini.NewRendererWithMetadata(metadata))
content = markdown.Render(ast, gemini.NewRendererWithMetadata(metadata))
} else {
geminiContent = markdown.Render(ast, gemini.NewRenderer())
content = markdown.Render(ast, gemini.NewRenderer())
}
for li := bytes.LastIndex(content, trailing); li != -1; li = bytes.LastIndex(content, trailing) {
if li != len(content)-len(trailing) {
break
}
content = content[:len(content)-1]
}
if metadata.PostIsDraft {
return geminiContent, metadata, fmt.Errorf("%s: %w", metadata.PostTitle, ErrPostIsDraft)
return content, metadata, fmt.Errorf("%s: %w", metadata.PostTitle, ErrPostIsDraft)
}
return geminiContent, metadata, nil
return content, metadata, nil
}