3
0

Tweak renderer structure

This commit is contained in:
Tomaž Jerman 2021-02-16 09:26:29 +01:00
parent 331f43a8b4
commit c7636e2bb0
6 changed files with 123 additions and 118 deletions

View File

@ -10,31 +10,31 @@ import (
)
type (
genericTXT struct{}
genericTXTDriver struct{}
genericText struct{}
genericTextDriver struct{}
)
var (
plainTextRegex = regexp.MustCompile("text(/)?.*")
)
func newGenericTXT() driverFactory {
return &genericTXT{}
func newGenericText() driverFactory {
return &genericText{}
}
func (d *genericTXT) CanRender(t types.DocumentType) bool {
func (d *genericText) CanRender(t types.DocumentType) bool {
return t == types.DocumentTypePlain || t == types.DocumentTypeHTML
}
func (d *genericTXT) CanProduce(t types.DocumentType) bool {
func (d *genericText) CanProduce(t types.DocumentType) bool {
return t == types.DocumentTypePlain
}
func (d *genericTXT) Driver() driver {
return &genericTXTDriver{}
func (d *genericText) Driver() driver {
return &genericTextDriver{}
}
func (d *genericTXTDriver) Render(ctx context.Context, pl *driverPayload) (io.ReadSeeker, error) {
func (d *genericTextDriver) Render(ctx context.Context, pl *driverPayload) (io.ReadSeeker, error) {
t, err := preprocPlainTemplate(pl.Template, pl.Partials)
if err != nil {
return nil, err

75
system/renderer/html.go Normal file
View File

@ -0,0 +1,75 @@
package renderer
import (
"encoding/base64"
"html/template"
"io/ioutil"
"net/http"
"github.com/Masterminds/sprig"
)
func preprocHTMLTemplate(pl *driverPayload) (*template.Template, error) {
bb, err := ioutil.ReadAll(pl.Template)
if err != nil {
return nil, err
}
gtpl := template.New("text/html_render").
Funcs(sprig.FuncMap()).
Funcs(template.FuncMap{
// "attachDataURL": func(name string) template.URL {
// // Find the attachment
// att, has := pl.Attachments[name]
// if !has {
// return template.URL(fmt.Sprintf("error: attachment not found: %s", name))
// }
// // Process source
// bb, err := ioutil.ReadAll(att.Source)
// if err != nil {
// return template.URL(fmt.Sprintf("error: %s", err.Error()))
// }
// return template.URL("data:" + att.Mime + ";base64," + base64.RawStdEncoding.EncodeToString(bb))
// },
"inlineRemote": func(url string) (template.URL, error) {
rsp, err := http.Get(url)
if err != nil {
return "", err
}
defer rsp.Body.Close()
bb, err := ioutil.ReadAll(rsp.Body)
if err != nil {
return "", err
}
raw := base64.RawStdEncoding.EncodeToString(bb)
return template.URL("data:" + rsp.Header.Get("Content-Type") + ";base64," + raw), nil
},
})
// Prep the original template
t, err := gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
// Prep partials
for _, p := range pl.Partials {
bb, err = ioutil.ReadAll(p)
if err != nil {
return nil, err
}
t, err = gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
}
return t, nil
}

View File

@ -16,13 +16,13 @@ type (
func Renderer(cfg options.TemplateOpt) *renderer {
ff := make([]driverFactory, 0, 3)
ff = append(ff, newGenericTXT(), newGenericHTML())
ff = append(ff, newGenericText(), newGenericHTML())
if cfg.RendererGotenbergEnabled {
ff = append(ff, newGotenbergPDF(cfg.RendererGotenbergAddress))
}
return &renderer{
factories: []driverFactory{},
factories: ff,
}
}

37
system/renderer/text.go Normal file
View File

@ -0,0 +1,37 @@
package renderer
import (
"io"
"io/ioutil"
"text/template"
)
func preprocPlainTemplate(tpl io.Reader, pp map[string]io.Reader) (*template.Template, error) {
bb, err := ioutil.ReadAll(tpl)
if err != nil {
return nil, err
}
gtpl := template.New("text/plain_render")
// Prep the original template
t, err := gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
// Prep partials
for _, p := range pp {
bb, err = ioutil.ReadAll(p)
if err != nil {
return nil, err
}
t, err = gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
}
return t, nil
}

View File

@ -1,107 +0,0 @@
package renderer
import (
"encoding/base64"
htpl "html/template"
ttpl "html/template"
"io"
"io/ioutil"
"net/http"
"github.com/Masterminds/sprig"
)
func preprocHTMLTemplate(pl *driverPayload) (*htpl.Template, error) {
bb, err := ioutil.ReadAll(pl.Template)
if err != nil {
return nil, err
}
gtpl := htpl.New("text/html_render").
Funcs(sprig.FuncMap()).
Funcs(htpl.FuncMap{
// "attachDataURL": func(name string) htpl.URL {
// // Find the attachment
// att, has := pl.Attachments[name]
// if !has {
// return htpl.URL(fmt.Sprintf("error: attachment not found: %s", name))
// }
// // Process source
// bb, err := ioutil.ReadAll(att.Source)
// if err != nil {
// return htpl.URL(fmt.Sprintf("error: %s", err.Error()))
// }
// return htpl.URL("data:" + att.Mime + ";base64," + base64.RawStdEncoding.EncodeToString(bb))
// },
"inlineRemote": func(url string) (htpl.URL, error) {
rsp, err := http.Get(url)
if err != nil {
return "", err
}
defer rsp.Body.Close()
bb, err := ioutil.ReadAll(rsp.Body)
if err != nil {
return "", err
}
raw := base64.RawStdEncoding.EncodeToString(bb)
return htpl.URL("data:" + rsp.Header.Get("Content-Type") + ";base64," + raw), nil
},
})
// Prep the original template
t, err := gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
// Prep partials
for _, p := range pl.Partials {
bb, err = ioutil.ReadAll(p)
if err != nil {
return nil, err
}
t, err = gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
}
return t, nil
}
func preprocPlainTemplate(tpl io.Reader, pp map[string]io.Reader) (*ttpl.Template, error) {
bb, err := ioutil.ReadAll(tpl)
if err != nil {
return nil, err
}
gtpl := ttpl.New("text/plain_render")
// Prep the original template
t, err := gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
// Prep partials
for _, p := range pp {
bb, err = ioutil.ReadAll(p)
if err != nil {
return nil, err
}
t, err = gtpl.Parse(string(bb))
if err != nil {
return nil, err
}
}
return t, nil
}