From 8a49c0b3b8b5a374a64b639f46806192cd663fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 30 Apr 2017 21:52:56 +0200 Subject: tpl/collections: Make it a package that stands on its own See #3042 --- deps/deps.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'deps') diff --git a/deps/deps.go b/deps/deps.go index 99763c115..5f016c4d7 100644 --- a/deps/deps.go +++ b/deps/deps.go @@ -20,8 +20,8 @@ type Deps struct { // The logger to use. Log *jww.Notepad `json:"-"` - // The templates to use. - Tmpl tpl.TemplateHandler `json:"-"` + // The templates to use. This will usually implement the full tpl.TemplateHandler. + Tmpl tpl.TemplateFinder `json:"-"` // The file systems to use. Fs *hugofs.Fs `json:"-"` @@ -55,6 +55,10 @@ type ResourceProvider interface { Clone(deps *Deps) error } +func (d *Deps) TemplateHandler() tpl.TemplateHandler { + return d.Tmpl.(tpl.TemplateHandler) +} + func (d *Deps) LoadResources() error { // Note that the translations need to be loaded before the templates. if err := d.translationProvider.Update(d); err != nil { @@ -64,7 +68,10 @@ func (d *Deps) LoadResources() error { if err := d.templateProvider.Update(d); err != nil { return err } - d.Tmpl.PrintErrors() + + if th, ok := d.Tmpl.(tpl.TemplateHandler); ok { + th.PrintErrors() + } return nil } -- cgit v1.2.3