1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-07 07:36:25 +00:00

Add context to asciidoc/-tor error logging

Add DocumentName (path to the file being rendered) to RenderingContext
and use that information to include the path in the error print.

See 
Closes 
This commit is contained in:
C. Hoeppler 2016-10-13 10:30:43 +02:00 committed by Bjørn Erik Pedersen
parent 9f9b93af2c
commit 766c82a6bb
3 changed files with 10 additions and 5 deletions

View file

@ -354,6 +354,7 @@ type RenderingContext struct {
Content []byte
PageFmt string
DocumentID string
DocumentName string
Config *Blackfriday
RenderTOC bool
FileResolver FileResolverFunc
@ -383,7 +384,7 @@ func RenderBytes(ctx *RenderingContext) []byte {
case "markdown":
return markdownRender(ctx)
case "asciidoc":
return getAsciidocContent(ctx.Content)
return getAsciidocContent(ctx)
case "mmark":
return mmarkRender(ctx)
case "rst":
@ -533,7 +534,8 @@ func HasAsciidoc() bool {
// getAsciidocContent calls asciidoctor or asciidoc as an external helper
// to convert AsciiDoc content to HTML.
func getAsciidocContent(content []byte) []byte {
func getAsciidocContent(ctx *RenderingContext) []byte {
content := ctx.Content
cleanContent := bytes.Replace(content, SummaryDivider, []byte(""), 1)
path := getAsciidocExecPath()
@ -555,7 +557,7 @@ func getAsciidocContent(content []byte) []byte {
for _, item := range strings.Split(string(cmderr.Bytes()), "\n") {
item := strings.TrimSpace(item)
if item != "" {
jww.ERROR.Println(item)
jww.ERROR.Println(strings.Replace(item, "<stdin>", ctx.DocumentName, 1))
}
}
if err != nil {

View file

@ -380,7 +380,8 @@ func (p *Page) renderContent(content []byte) []byte {
return helpers.RenderBytes(&helpers.RenderingContext{
Content: content, RenderTOC: true, PageFmt: p.determineMarkupType(),
ConfigProvider: p.Language(),
DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
DocumentID: p.UniqueID(), DocumentName: p.Path(),
Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
}
func (p *Page) getRenderingConfig() *helpers.Blackfriday {

View file

@ -243,7 +243,9 @@ func renderShortcode(sc shortcode, parent *ShortcodeWithPage, p *Page, t tpl.Tem
newInner := helpers.RenderBytes(&helpers.RenderingContext{
Content: []byte(inner), PageFmt: p.determineMarkupType(),
ConfigProvider: p.Language(),
DocumentID: p.UniqueID(), Config: p.getRenderingConfig()})
DocumentID: p.UniqueID(),
DocumentName: p.Path(),
Config: p.getRenderingConfig()})
// If the type is “unknown” or “markdown”, we assume the markdown
// generation has been performed. Given the input: `a line`, markdown