From 0a9e6c793dc1d91d71db6838e2c45adecc6aae92 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Mon, 1 Aug 2022 20:03:01 +0700 Subject: all: export the Converter method to reload HTML template The SetHtmlTemplateFile set or changes the HTML template used by Converter to convert AsciiDoc to HTML. --- converter.go | 12 +++++++----- watcher.go | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/converter.go b/converter.go index 0f819cf..be8d9a0 100644 --- a/converter.go +++ b/converter.go @@ -17,7 +17,7 @@ import ( type Converter struct { tmpl *template.Template tmplSearch *template.Template - htmlTemplate string + htmlTemplate string // Path to HTML template in storage. } // NewConverter create and initialize Converter with HTML template. @@ -86,19 +86,21 @@ func (converter *Converter) convertFileMarkups(fileMarkups map[string]*fileMarku } } -func (converter *Converter) htmlTemplateReload() (err error) { - converter.tmpl, err = template.ParseFiles(converter.htmlTemplate) +func (converter *Converter) htmlTemplateUseInternal() (err error) { + converter.tmpl, err = converter.tmpl.Parse(templateIndexHTML) if err != nil { return err } return nil } -func (converter *Converter) htmlTemplateUseInternal() (err error) { - converter.tmpl, err = converter.tmpl.Parse(templateIndexHTML) +// SetHtmlTemplateFile set the HTML template from file. +func (converter *Converter) SetHtmlTemplateFile(pathHtmlTemplate string) (err error) { + converter.tmpl, err = template.ParseFiles(pathHtmlTemplate) if err != nil { return err } + converter.htmlTemplate = pathHtmlTemplate return nil } diff --git a/watcher.go b/watcher.go index 25bb12a..1d87d00 100644 --- a/watcher.go +++ b/watcher.go @@ -183,7 +183,7 @@ func (w *watcher) watchHtmlTemplate() { } else { fmt.Printf("%s: recompiling HTML template %q ...\n", logp, ns.Node.SysPath) - err = w.converter.htmlTemplateReload() + err = w.converter.SetHtmlTemplateFile(w.converter.htmlTemplate) } if err != nil { log.Printf("%s: %s", logp, err) -- cgit v1.3