Merge pull request #3 from dannykopping/fix-2

Loads templates from embedded FS & improves Web UI errors
dannykopping · Jul 5, 2022 · 39fda0b · 39fda0b
2 parents 8c292d9 + 185e012
commit 39fda0b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/serve.go b/serve.go
@@ -3,6 +3,7 @@ package errata
 import (
 	"bytes"
 	"embed"
+	"errors"
 	"fmt"
 	"io/fs"
 	"net/http"
@@ -130,8 +131,19 @@ func (s *Server) render(w http.ResponseWriter, path string, data pongo2.Context)
 		s.errorHandler(w, NewFileNotReadableErr(err, path))
 	}
 
-	tmpl, err := pongo2.FromBytes(b)
+	set := pongo2.NewSet("web", pongo2.NewFSLoader(web))
+
+	tmpl, err := set.FromBytes(b)
 	if err != nil {
+		// pongo2 needs errata!
+		if err, ok := err.(*pongo2.Error); ok {
+			var pathErr *fs.PathError
+			if err.OrigError.Error() == "unable to resolve template" || errors.As(err.OrigError, &pathErr) {
+				s.errorHandler(w, NewTemplateExecutionErr(err))
+				return
+			}
+		}
+
 		s.errorHandler(w, NewInvalidSyntaxErr(err, path))
 		return
 	}
@@ -195,7 +207,7 @@ func (s *Server) errorHandler(w http.ResponseWriter, err error) {
 		}
 	}
 
-	http.Error(w, err.Error(), statusCode)
+	http.Error(w, fmt.Sprintf("%+v", err), statusCode)
 }
 
 type HTTPStatusCodeExtractor interface {

diff --git a/web/list.gohtml b/web/list.gohtml
@@ -1,6 +1,6 @@
 {% import "web/item.gohtml" erratum %}
 {% import "web/sidebar.gohtml" sidebar %}
-{% ssi "web/header.gohtml" %}
+{% ssi "web/header.gohtml" parsed %}
 
 <div class="docs-wrapper">
   {{ sidebar(Errors) }}
@@ -21,4 +21,4 @@
   </div>
 </div><!--//docs-wrapper-->
 
-{% ssi "web/footer.gohtml" %}
+{% ssi "web/footer.gohtml" parsed %}
diff --git a/web/search-miss.gohtml b/web/search-miss.gohtml
@@ -1,4 +1,4 @@
-{% ssi "web/header.gohtml" %}
+{% ssi "web/header.gohtml" parsed %}
 
 <div class="docs-wrapper">
   <div class="docs-content">
@@ -10,4 +10,4 @@
   </div>
 </div><!--//docs-wrapper-->
 
-{% ssi "web/footer.gohtml" %}
+{% ssi "web/footer.gohtml" parsed %}
diff --git a/web/single.gohtml b/web/single.gohtml
@@ -1,5 +1,5 @@
 {% import "web/item.gohtml" erratum %}
-{% ssi "web/header.gohtml" %}
+{% ssi "web/header.gohtml" parsed %}
 
 <div class="docs-wrapper">
   <div class="docs-content">
@@ -11,4 +11,4 @@
   </div>
 </div><!--//docs-wrapper-->
 
-{% ssi "web/footer.gohtml" %}
+{% ssi "web/footer.gohtml" parsed %}