aboutsummaryrefslogtreecommitdiff
path: root/hswg/main.go
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2020-08-15 04:21:56 +0200
committerPřemysl Eric Janouch <p@janouch.name>2020-08-15 04:26:50 +0200
commit3a5cc216bb6d497b28103d19b8471b5a89498cf9 (patch)
treea9dde1c590ceab784f0796da96fafa9ab4775167 /hswg/main.go
parenta049249d8163a3ea02fb1c91cceaf2d1c6700f30 (diff)
downloadhaven-3a5cc216bb6d497b28103d19b8471b5a89498cf9.tar.gz
haven-3a5cc216bb6d497b28103d19b8471b5a89498cf9.tar.xz
haven-3a5cc216bb6d497b28103d19b8471b5a89498cf9.zip
hswg: merge in hasp as a mode
No need to have the two-line header processor in two places.
Diffstat (limited to 'hswg/main.go')
-rw-r--r--hswg/main.go75
1 files changed, 56 insertions, 19 deletions
diff --git a/hswg/main.go b/hswg/main.go
index 595bb4a..2a46c6e 100644
--- a/hswg/main.go
+++ b/hswg/main.go
@@ -4,6 +4,7 @@ package main
import (
"bytes"
+ "encoding/xml"
"fmt"
"io"
"io/ioutil"
@@ -67,6 +68,41 @@ func ConvertTitles(w *io.PipeWriter, input []byte) {
writeLine(w, last, nil)
}
+// Render converts an io.Reader with an AsciiDoc document to HTML. So long as
+// the file could be read at all, it will always return a non-empty document.
+func Render(doc io.Reader, config configuration.Configuration) (
+ html *bytes.Buffer, meta types.Metadata, err error) {
+ html = bytes.NewBuffer(nil)
+
+ var input []byte
+ if input, err = ioutil.ReadAll(doc); err != nil {
+ return
+ }
+
+ pr, pw := io.Pipe()
+ go func() {
+ defer pw.Close()
+ ConvertTitles(pw, input)
+ }()
+
+ // io.Copy(os.Stdout, pr)
+ // return
+
+ meta, err = libasciidoc.ConvertToHTML(pr, html, config)
+ if err != nil {
+ // Fallback: output all the text sanitized for direct inclusion.
+ html.Reset()
+
+ _, _ = html.WriteString("<pre>")
+ for _, line := range bytes.Split(input, []byte{'\n'}) {
+ _ = xml.EscapeText(html, line)
+ _, _ = html.WriteString("\n")
+ }
+ _, _ = html.WriteString("</pre>")
+ }
+ return
+}
+
// entry contains all context information about a single page.
type entry struct {
path string // path
@@ -106,7 +142,23 @@ func expand(m *map[string]*entry, name string, chunk []byte) []byte {
})
}
+func singleFile() {
+ html, meta, err := Render(os.Stdin, configuration.NewConfiguration())
+ if err != nil {
+ log.Println(err)
+ } else if meta.Title != "" {
+ _, _ = os.Stdout.WriteString("<h1>")
+ _ = xml.EscapeText(os.Stdout, []byte(meta.Title))
+ _, _ = os.Stdout.WriteString("</h1>\n")
+ }
+ _, _ = io.Copy(os.Stdout, html)
+}
+
func main() {
+ if len(os.Args) < 2 {
+ singleFile()
+ return
+ }
if len(os.Args) < 3 {
log.Fatalf("usage: %s TEMPLATE GLOB...\n", os.Args[0])
}
@@ -146,32 +198,17 @@ func main() {
e.mtime = i.ModTime()
}
- input, err := ioutil.ReadAll(f)
- if err != nil {
- log.Fatalln(err)
- }
-
- pr, pw := io.Pipe()
- go func() {
- defer pw.Close()
- ConvertTitles(pw, input)
- }()
-
- config := configuration.NewConfiguration(
- configuration.WithHeaderFooter(false),
+ var html *bytes.Buffer
+ if html, e.metadata, err = Render(f, configuration.NewConfiguration(
configuration.WithFilename(e.path),
configuration.WithLastUpdated(e.mtime),
- )
-
- buf := bytes.NewBuffer(nil)
- e.metadata, err = libasciidoc.ConvertToHTML(pr, buf, config)
- if err != nil {
+ )); err != nil {
log.Fatalln(err)
}
// Expand LinkWords anywhere between <tags>.
// We want something like the inverse of Regexp.ReplaceAllStringFunc.
- raw, last, expanded := buf.Bytes(), 0, bytes.NewBuffer(nil)
+ raw, last, expanded := html.Bytes(), 0, bytes.NewBuffer(nil)
for _, where := range tagRE.FindAllIndex(raw, -1) {
_, _ = expanded.Write(expand(&entries, name, raw[last:where[0]]))
_, _ = expanded.Write(raw[where[0]:where[1]])