mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-28 01:40:47 +00: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
156 lines
3.4 KiB
Go
156 lines
3.4 KiB
Go
// Copyright 2019 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 tplimpl
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/tpl"
|
|
)
|
|
|
|
// Currently lang, outFormat, suffix
|
|
const numTemplateVariants = 3
|
|
|
|
type shortcodeVariant struct {
|
|
|
|
// The possible variants: lang, outFormat, suffix
|
|
// gtag
|
|
// gtag.html
|
|
// gtag.no.html
|
|
// gtag.no.amp.html
|
|
// A slice of length numTemplateVariants.
|
|
variants []string
|
|
|
|
ts *templateState
|
|
}
|
|
|
|
type shortcodeTemplates struct {
|
|
variants []shortcodeVariant
|
|
}
|
|
|
|
func (s *shortcodeTemplates) indexOf(variants []string) int {
|
|
L:
|
|
for i, v1 := range s.variants {
|
|
for i, v2 := range v1.variants {
|
|
if v2 != variants[i] {
|
|
continue L
|
|
}
|
|
}
|
|
return i
|
|
}
|
|
return -1
|
|
}
|
|
|
|
func (s *shortcodeTemplates) fromVariants(variants tpl.TemplateVariants) (shortcodeVariant, bool) {
|
|
return s.fromVariantsSlice([]string{
|
|
variants.Language,
|
|
strings.ToLower(variants.OutputFormat.Name),
|
|
variants.OutputFormat.MediaType.Suffix(),
|
|
})
|
|
}
|
|
|
|
func (s *shortcodeTemplates) fromVariantsSlice(variants []string) (shortcodeVariant, bool) {
|
|
var (
|
|
bestMatch shortcodeVariant
|
|
bestMatchWeight int
|
|
)
|
|
|
|
for _, variant := range s.variants {
|
|
w := s.compareVariants(variants, variant.variants)
|
|
if bestMatchWeight == 0 || w > bestMatchWeight {
|
|
bestMatch = variant
|
|
bestMatchWeight = w
|
|
}
|
|
}
|
|
|
|
return bestMatch, true
|
|
}
|
|
|
|
// calculate a weight for two string slices of same length.
|
|
// higher value means "better match".
|
|
func (s *shortcodeTemplates) compareVariants(a, b []string) int {
|
|
|
|
weight := 0
|
|
k := len(a)
|
|
for i, av := range a {
|
|
bv := b[i]
|
|
if av == bv {
|
|
// Add more weight to the left side (language...).
|
|
weight = weight + k - i
|
|
} else {
|
|
weight--
|
|
}
|
|
}
|
|
return weight
|
|
}
|
|
|
|
func templateVariants(name string) []string {
|
|
_, variants := templateNameAndVariants(name)
|
|
return variants
|
|
}
|
|
|
|
func templateNameAndVariants(name string) (string, []string) {
|
|
|
|
variants := make([]string, numTemplateVariants)
|
|
|
|
parts := strings.Split(name, ".")
|
|
|
|
if len(parts) <= 1 {
|
|
// No variants.
|
|
return name, variants
|
|
}
|
|
|
|
name = parts[0]
|
|
parts = parts[1:]
|
|
lp := len(parts)
|
|
start := len(variants) - lp
|
|
|
|
for i, j := start, 0; i < len(variants); i, j = i+1, j+1 {
|
|
variants[i] = parts[j]
|
|
}
|
|
|
|
if lp > 1 && lp < len(variants) {
|
|
for i := lp - 1; i > 0; i-- {
|
|
variants[i-1] = variants[i]
|
|
}
|
|
}
|
|
|
|
if lp == 1 {
|
|
// Suffix only. Duplicate it into the output format field to
|
|
// make HTML win over AMP.
|
|
variants[len(variants)-2] = variants[len(variants)-1]
|
|
}
|
|
|
|
return name, variants
|
|
}
|
|
|
|
func resolveTemplateType(name string) templateType {
|
|
if isShortcode(name) {
|
|
return templateShortcode
|
|
}
|
|
|
|
if strings.Contains(name, "partials/") {
|
|
return templatePartial
|
|
}
|
|
|
|
return templateUndefined
|
|
}
|
|
|
|
func isShortcode(name string) bool {
|
|
return strings.Contains(name, shortcodesPathPrefix)
|
|
}
|
|
|
|
func isInternal(name string) bool {
|
|
return strings.HasPrefix(name, internalPathPrefix)
|
|
}
|