summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2022-03-27 19:05:25 +0700
committerShulhan <ms@kilabit.info>2022-03-27 19:05:25 +0700
commite7aad5e32506da1d4f2377da5f6de0a24c3122a9 (patch)
tree8b65e0689daaa201344ebcbc59f8b327e6129af8
parent4c4b6f7048f9a069ea2ca5160b85d8bc243a44a7 (diff)
downloadciigo-e7aad5e32506da1d4f2377da5f6de0a24c3122a9.tar.xz
all: include the path that cause an error on newHTMLGenerator
In case the newHTMLGenerator return an error, it's hard to track which part of code that cause the error because there are three files being processed (the index HTML, HTML template, or internal template). This changes include the file that cause an error inside the error message.
-rw-r--r--htmlgenerator.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/htmlgenerator.go b/htmlgenerator.go
index 9f65f5f..9275067 100644
--- a/htmlgenerator.go
+++ b/htmlgenerator.go
@@ -35,25 +35,25 @@ func newHTMLGenerator(mfs *memfs.MemFS, htmlTemplate string, devel bool) (
if len(htmlTemplate) == 0 {
htmlg.tmpl, err = htmlg.tmpl.Parse(templateIndexHTML)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf("%s: %s: %w", logp, templateIndexHTML, err)
}
} else if mfs == nil || devel {
htmlg.htmlTemplate = filepath.Clean(htmlTemplate)
bhtml, err := ioutil.ReadFile(htmlg.htmlTemplate)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf("%s: %s: %w", logp, htmlg.htmlTemplate, err)
}
htmlg.tmpl, err = htmlg.tmpl.Parse(string(bhtml))
if err != nil {
- return nil, fmt.Errorf("%s: %s", logp, err)
+ return nil, fmt.Errorf("%s: Parse: %s", logp, err)
}
} else {
// Load HTML template from memory file system.
tmplNode, err := mfs.Get(internalTemplatePath)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf("%s: %s: %w", logp, internalTemplatePath, err)
}
htmlg.tmpl, err = htmlg.tmpl.Parse(string(tmplNode.Content))
@@ -65,7 +65,7 @@ func newHTMLGenerator(mfs *memfs.MemFS, htmlTemplate string, devel bool) (
htmlg.tmplSearch = template.New("search")
htmlg.tmplSearch, err = htmlg.tmplSearch.Parse(templateSearch)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf("%s: %s: %w", logp, templateSearch, err)
}
return htmlg, nil