mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
c6d650c8c8
This more or less completes the simplification of the template handling code in Hugo started in v0.62. The main motivation was to fix a long lasting issue about a crash in HTML content files without front matter. But this commit also comes with a big functional improvement. As we now have moved the base template evaluation to the build stage we now use the same lookup rules for `baseof` as for `list` etc. type of templates. This means that in this simple example you can have a `baseof` template for the `blog` section without having to duplicate the others: ``` layouts ├── _default │ ├── baseof.html │ ├── list.html │ └── single.html └── blog └── baseof.html ``` Also, when simplifying code, you often get rid of some double work, as shown in the "site building" benchmarks below. These benchmarks looks suspiciously good, but I have repeated the below with ca. the same result. Compared to master: ``` name old time/op new time/op delta SiteNew/Bundle_with_image-16 13.1ms ± 1% 10.5ms ± 1% -19.34% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 13.0ms ± 0% 10.7ms ± 1% -18.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 46.4ms ± 2% 43.1ms ± 1% -7.15% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 52.2ms ± 2% 47.8ms ± 1% -8.30% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 77.9ms ± 1% 70.9ms ± 1% -9.01% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 43.0ms ± 0% 37.2ms ± 1% -13.54% (p=0.029 n=4+4) SiteNew/Page_collections-16 58.2ms ± 1% 52.4ms ± 1% -9.95% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Bundle_with_image-16 3.81MB ± 0% 2.22MB ± 0% -41.70% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 3.60MB ± 0% 2.01MB ± 0% -44.20% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 19.3MB ± 1% 14.1MB ± 0% -26.91% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 70.7MB ± 0% 69.0MB ± 0% -2.40% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 37.1MB ± 0% 31.2MB ± 0% -15.94% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 17.6MB ± 0% 10.6MB ± 0% -39.92% (p=0.029 n=4+4) SiteNew/Page_collections-16 25.9MB ± 0% 21.2MB ± 0% -17.99% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Bundle_with_image-16 52.3k ± 0% 26.1k ± 0% -50.18% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 52.3k ± 0% 26.1k ± 0% -50.16% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 336k ± 1% 269k ± 0% -19.90% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 422k ± 0% 395k ± 0% -6.43% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 401k ± 0% 313k ± 0% -21.79% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 247k ± 0% 143k ± 0% -42.17% (p=0.029 n=4+4) SiteNew/Page_collections-16 282k ± 0% 207k ± 0% -26.55% (p=0.029 n=4+4) ``` Fixes #6716 Fixes #6760 Fixes #6768 Fixes #6778
237 lines
5.7 KiB
Go
237 lines
5.7 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Package partials provides template functions for working with reusable
|
|
// templates.
|
|
package partials
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"html/template"
|
|
"io"
|
|
"io/ioutil"
|
|
"reflect"
|
|
"strings"
|
|
"sync"
|
|
|
|
texttemplate "github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/gohugoio/hugo/tpl"
|
|
|
|
bp "github.com/gohugoio/hugo/bufferpool"
|
|
"github.com/gohugoio/hugo/deps"
|
|
)
|
|
|
|
// TestTemplateProvider is global deps.ResourceProvider.
|
|
// NOTE: It's currently unused.
|
|
var TestTemplateProvider deps.ResourceProvider
|
|
|
|
type partialCacheKey struct {
|
|
name string
|
|
variant interface{}
|
|
}
|
|
|
|
// partialCache represents a cache of partials protected by a mutex.
|
|
type partialCache struct {
|
|
sync.RWMutex
|
|
p map[partialCacheKey]interface{}
|
|
}
|
|
|
|
func (p *partialCache) clear() {
|
|
p.Lock()
|
|
defer p.Unlock()
|
|
p.p = make(map[partialCacheKey]interface{})
|
|
}
|
|
|
|
// New returns a new instance of the templates-namespaced template functions.
|
|
func New(deps *deps.Deps) *Namespace {
|
|
cache := &partialCache{p: make(map[partialCacheKey]interface{})}
|
|
deps.BuildStartListeners.Add(
|
|
func() {
|
|
cache.clear()
|
|
})
|
|
|
|
return &Namespace{
|
|
deps: deps,
|
|
cachedPartials: cache,
|
|
}
|
|
}
|
|
|
|
// Namespace provides template functions for the "templates" namespace.
|
|
type Namespace struct {
|
|
deps *deps.Deps
|
|
cachedPartials *partialCache
|
|
}
|
|
|
|
// contextWrapper makes room for a return value in a partial invocation.
|
|
type contextWrapper struct {
|
|
Arg interface{}
|
|
Result interface{}
|
|
}
|
|
|
|
// Set sets the return value and returns an empty string.
|
|
func (c *contextWrapper) Set(in interface{}) string {
|
|
c.Result = in
|
|
return ""
|
|
}
|
|
|
|
// Include executes the named partial.
|
|
// If the partial contains a return statement, that value will be returned.
|
|
// Else, the rendered output will be returned:
|
|
// A string if the partial is a text/template, or template.HTML when html/template.
|
|
func (ns *Namespace) Include(name string, contextList ...interface{}) (interface{}, error) {
|
|
if strings.HasPrefix(name, "partials/") {
|
|
name = name[8:]
|
|
}
|
|
var context interface{}
|
|
|
|
if len(contextList) == 0 {
|
|
context = nil
|
|
} else {
|
|
context = contextList[0]
|
|
}
|
|
|
|
n := "partials/" + name
|
|
templ, found := ns.deps.Tmpl().Lookup(n)
|
|
|
|
if !found {
|
|
// For legacy reasons.
|
|
templ, found = ns.deps.Tmpl().Lookup(n + ".html")
|
|
}
|
|
|
|
if !found {
|
|
return "", fmt.Errorf("partial %q not found", name)
|
|
}
|
|
|
|
var info tpl.ParseInfo
|
|
if ip, ok := templ.(tpl.Info); ok {
|
|
info = ip.ParseInfo()
|
|
}
|
|
|
|
var w io.Writer
|
|
|
|
if info.HasReturn {
|
|
// Wrap the context sent to the template to capture the return value.
|
|
// Note that the template is rewritten to make sure that the dot (".")
|
|
// and the $ variable points to Arg.
|
|
context = &contextWrapper{
|
|
Arg: context,
|
|
}
|
|
|
|
// We don't care about any template output.
|
|
w = ioutil.Discard
|
|
} else {
|
|
b := bp.GetBuffer()
|
|
defer bp.PutBuffer(b)
|
|
w = b
|
|
}
|
|
|
|
if err := ns.deps.Tmpl().Execute(templ, w, context); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
var result interface{}
|
|
|
|
if ctx, ok := context.(*contextWrapper); ok {
|
|
result = ctx.Result
|
|
} else if _, ok := templ.(*texttemplate.Template); ok {
|
|
result = w.(fmt.Stringer).String()
|
|
} else {
|
|
result = template.HTML(w.(fmt.Stringer).String())
|
|
}
|
|
|
|
if ns.deps.Metrics != nil {
|
|
ns.deps.Metrics.TrackValue(n, result)
|
|
}
|
|
|
|
return result, nil
|
|
|
|
}
|
|
|
|
// IncludeCached executes and caches partial templates. The cache is created with name+variants as the key.
|
|
func (ns *Namespace) IncludeCached(name string, context interface{}, variants ...interface{}) (interface{}, error) {
|
|
key, err := createKey(name, variants...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
result, err := ns.getOrCreate(key, context)
|
|
if err == errUnHashable {
|
|
// Try one more
|
|
key.variant = helpers.HashString(key.variant)
|
|
result, err = ns.getOrCreate(key, context)
|
|
}
|
|
|
|
return result, err
|
|
}
|
|
|
|
func createKey(name string, variants ...interface{}) (partialCacheKey, error) {
|
|
var variant interface{}
|
|
|
|
if len(variants) > 1 {
|
|
variant = helpers.HashString(variants...)
|
|
} else if len(variants) == 1 {
|
|
variant = variants[0]
|
|
t := reflect.TypeOf(variant)
|
|
switch t.Kind() {
|
|
// This isn't an exhaustive list of unhashable types.
|
|
// There may be structs with slices,
|
|
// but that should be very rare. We do recover from that situation
|
|
// below.
|
|
case reflect.Slice, reflect.Array, reflect.Map:
|
|
variant = helpers.HashString(variant)
|
|
}
|
|
}
|
|
|
|
return partialCacheKey{name: name, variant: variant}, nil
|
|
}
|
|
|
|
var errUnHashable = errors.New("unhashable")
|
|
|
|
func (ns *Namespace) getOrCreate(key partialCacheKey, context interface{}) (result interface{}, err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = r.(error)
|
|
if strings.Contains(err.Error(), "unhashable type") {
|
|
ns.cachedPartials.RUnlock()
|
|
err = errUnHashable
|
|
}
|
|
}
|
|
}()
|
|
|
|
ns.cachedPartials.RLock()
|
|
p, ok := ns.cachedPartials.p[key]
|
|
ns.cachedPartials.RUnlock()
|
|
|
|
if ok {
|
|
return p, nil
|
|
}
|
|
|
|
p, err = ns.Include(key.name, context)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ns.cachedPartials.Lock()
|
|
defer ns.cachedPartials.Unlock()
|
|
// Double-check.
|
|
if p2, ok := ns.cachedPartials.p[key]; ok {
|
|
return p2, nil
|
|
}
|
|
ns.cachedPartials.p[key] = p
|
|
|
|
return p, nil
|
|
}
|