diff options
| author | C. Hoeppler <hoeppler@gmx.net> | 2016-10-13 11:30:43 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-10-13 14:48:43 +0300 |
| commit | 766c82a6bbf4423a037beb2b1967f720080e4658 (patch) | |
| tree | 443ea3cebd9f72ba23c2d1fb1d9350f4a8453bef /helpers | |
| parent | 9f9b93af2c379b10d2d5c514cfe5f0658795b9bb (diff) | |
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 #2399
Closes #2567
Diffstat (limited to 'helpers')
| -rw-r--r-- | helpers/content.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/helpers/content.go b/helpers/content.go index f2909f208..516fc72b9 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -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 { |