Skip to content

Commit

Permalink
Add subdirectory supports for HTML method
Browse files Browse the repository at this point in the history
  • Loading branch information
thedevsaddam committed Dec 28, 2017
1 parent 3d25f66 commit a01ea90
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package renderer
==================
[![Build Status](https://travis-ci.org/thedevsaddam/renderer.svg?branch=master)](https://travis-ci.org/thedevsaddam/renderer)
[![Project status](https://img.shields.io/badge/version-1.1-green.svg)](https://github.com/thedevsaddam/renderer/releases)
[![Project status](https://img.shields.io/badge/version-1.2-green.svg)](https://github.com/thedevsaddam/renderer/releases)
[![Go Report Card](https://goreportcard.com/badge/github.com/thedevsaddam/renderer)](https://goreportcard.com/report/github.com/thedevsaddam/renderer)
[![Coverage Status](https://coveralls.io/repos/github/thedevsaddam/renderer/badge.svg?branch=master)](https://coveralls.io/github/thedevsaddam/renderer?branch=master)
[![GoDoc](https://godoc.org/github.com/thedevsaddam/renderer?status.svg)](https://godoc.org/github.com/thedevsaddam/renderer)
Expand Down
22 changes: 21 additions & 1 deletion renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import (
"html/template"
"io"
"io/ioutil"
"log"
"net/http"
"os"
"path/filepath"
"strings"

Expand Down Expand Up @@ -562,5 +564,23 @@ func (r *Render) parseGlob() {
for _, fm := range r.opts.FuncMap {
tmpl.Funcs(fm)
}
r.globTemplates = template.Must(tmpl.ParseGlob(r.opts.ParseGlobPattern))
if !strings.Contains(r.opts.ParseGlobPattern, "*.") {
log.Fatal("renderer: invalid glob pattern!")
}
pf := strings.Split(r.opts.ParseGlobPattern, "*")
fPath := pf[0]
fExt := pf[1]
err := filepath.Walk(fPath, func(path string, info os.FileInfo, err error) error {
if strings.Contains(path, fExt) {
_, err = tmpl.ParseFiles(path)
if err != nil {
log.Println(err)
}
}
return err
})
if err != nil {
log.Fatal(err)
}
r.globTemplates = tmpl
}

0 comments on commit a01ea90

Please sign in to comment.