mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-27 22:21:07 +03:00
tpl/tplimpl: Rework template management to get rid of concurrency issues
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
This commit is contained in:
Bjørn Erik Pedersen
parent
8585b388d2
commit
c6d650c8c8
46 changed files with 1332 additions and 1446 deletions
|
|
@ -19,6 +19,8 @@ import (
|
|||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/gohugoio/hugo/tpl"
|
||||
|
||||
"github.com/gohugoio/hugo/config"
|
||||
|
||||
"github.com/gohugoio/hugo/output"
|
||||
|
|
@ -136,33 +138,62 @@ func pageRenderer(
|
|||
continue
|
||||
}
|
||||
|
||||
layouts, err := p.getLayouts()
|
||||
templ, found, err := p.resolveTemplate()
|
||||
if err != nil {
|
||||
s.Log.ERROR.Printf("Failed to resolve layout for output %q for page %q: %s", f.Name, p, err)
|
||||
s.SendError(p.errorf(err, "failed to resolve template"))
|
||||
continue
|
||||
}
|
||||
|
||||
if !found {
|
||||
s.logMissingLayout("", p.Kind(), f.Name)
|
||||
continue
|
||||
}
|
||||
|
||||
targetPath := p.targetPaths().TargetFilename
|
||||
|
||||
if targetPath == "" {
|
||||
s.Log.ERROR.Printf("Failed to create target path for output %q for page %q: %s", f.Name, p, err)
|
||||
continue
|
||||
}
|
||||
|
||||
if err := s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "page "+p.Title(), targetPath, p, layouts...); err != nil {
|
||||
if err := s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "page "+p.Title(), targetPath, p, templ); err != nil {
|
||||
results <- err
|
||||
}
|
||||
|
||||
if p.paginator != nil && p.paginator.current != nil {
|
||||
if err := s.renderPaginator(p, layouts); err != nil {
|
||||
if err := s.renderPaginator(p, templ); err != nil {
|
||||
results <- err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Site) logMissingLayout(name, kind, outputFormat string) {
|
||||
log := s.Log.WARN
|
||||
if name != "" && infoOnMissingLayout[name] {
|
||||
log = s.Log.INFO
|
||||
}
|
||||
|
||||
errMsg := "You should create a template file which matches Hugo Layouts Lookup Rules for this combination."
|
||||
var args []interface{}
|
||||
msg := "found no layout file for"
|
||||
if outputFormat != "" {
|
||||
msg += " %q"
|
||||
args = append(args, outputFormat)
|
||||
}
|
||||
|
||||
if kind != "" {
|
||||
msg += " for kind %q"
|
||||
args = append(args, kind)
|
||||
}
|
||||
|
||||
if name != "" {
|
||||
msg += " for %q"
|
||||
args = append(args, name)
|
||||
}
|
||||
|
||||
msg += ": " + errMsg
|
||||
|
||||
log.Printf(msg, args...)
|
||||
}
|
||||
|
||||
// renderPaginator must be run after the owning Page has been rendered.
|
||||
func (s *Site) renderPaginator(p *pageState, layouts []string) error {
|
||||
func (s *Site) renderPaginator(p *pageState, templ tpl.Template) error {
|
||||
|
||||
paginatePath := s.Cfg.GetString("paginatePath")
|
||||
|
||||
|
|
@ -192,7 +223,7 @@ func (s *Site) renderPaginator(p *pageState, layouts []string) error {
|
|||
if err := s.renderAndWritePage(
|
||||
&s.PathSpec.ProcessingStats.PaginatorPages,
|
||||
p.Title(),
|
||||
targetPaths.TargetFilename, p, layouts...); err != nil {
|
||||
targetPaths.TargetFilename, p, templ); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -220,15 +251,14 @@ func (s *Site) render404() error {
|
|||
return err
|
||||
}
|
||||
|
||||
nfLayouts := []string{"404.html"}
|
||||
|
||||
templ := s.lookupLayouts("404.html")
|
||||
targetPath := p.targetPaths().TargetFilename
|
||||
|
||||
if targetPath == "" {
|
||||
return errors.New("failed to create targetPath for 404 page")
|
||||
}
|
||||
|
||||
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, p, nfLayouts...)
|
||||
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, p, templ)
|
||||
}
|
||||
|
||||
func (s *Site) renderSitemap() error {
|
||||
|
|
@ -255,9 +285,9 @@ func (s *Site) renderSitemap() error {
|
|||
return errors.New("failed to create targetPath for sitemap")
|
||||
}
|
||||
|
||||
smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
|
||||
templ := s.lookupLayouts("sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml")
|
||||
|
||||
return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemap", targetPath, p, smLayouts...)
|
||||
return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemap", targetPath, p, templ)
|
||||
}
|
||||
|
||||
func (s *Site) renderRobotsTXT() error {
|
||||
|
|
@ -282,9 +312,9 @@ func (s *Site) renderRobotsTXT() error {
|
|||
return err
|
||||
}
|
||||
|
||||
rLayouts := []string{"robots.txt", "_default/robots.txt", "_internal/_default/robots.txt"}
|
||||
templ := s.lookupLayouts("robots.txt", "_default/robots.txt", "_internal/_default/robots.txt")
|
||||
|
||||
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", p.targetPaths().TargetFilename, p, rLayouts...)
|
||||
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", p.targetPaths().TargetFilename, p, templ)
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue