mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-01 16:09:10 -05:00
eada236f87
This commit introduces a new data structure to store pages and their resources. This data structure is backed by radix trees. This simplies tree operations, makes all pages a bundle, and paves the way for #6310. It also solves a set of annoying issues (see list below). Not a motivation behind this, but this commit also makes Hugo in general a little bit faster and more memory effective (see benchmarks). Especially for partial rebuilds on content edits, but also when taxonomies is in use. ``` name old time/op new time/op delta SiteNew/Bundle_with_image/Edit-16 1.32ms ± 8% 1.00ms ± 9% -24.42% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 1.28ms ± 0% 0.94ms ± 0% -26.26% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 33.9ms ± 2% 21.8ms ± 1% -35.67% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 40.6ms ± 1% 37.7ms ± 3% -7.20% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 56.7ms ± 0% 51.7ms ± 1% -8.82% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 19.9ms ± 2% 18.3ms ± 3% -7.64% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 37.9ms ± 4% 34.0ms ± 2% -10.28% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 10.7ms ± 0% 10.6ms ± 0% -1.15% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 10.8ms ± 0% 10.7ms ± 0% -1.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 43.2ms ± 1% 39.6ms ± 1% -8.35% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 47.6ms ± 1% 47.3ms ± 0% ~ (p=0.057 n=4+4) SiteNew/Deep_content_tree-16 73.0ms ± 1% 74.2ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Many_HTML_templates-16 37.9ms ± 0% 38.1ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Page_collections-16 53.6ms ± 1% 54.7ms ± 1% +2.09% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Bundle_with_image/Edit-16 486kB ± 0% 430kB ± 0% -11.47% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 265kB ± 0% 209kB ± 0% -21.06% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 13.6MB ± 0% 8.8MB ± 0% -34.93% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 66.5MB ± 0% 63.9MB ± 0% -3.95% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 28.8MB ± 0% 25.8MB ± 0% -10.55% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 6.16MB ± 0% 5.56MB ± 0% -9.86% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 16.9MB ± 0% 16.0MB ± 0% -5.19% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 2.28MB ± 0% 2.29MB ± 0% +0.35% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 2.07MB ± 0% 2.07MB ± 0% ~ (p=0.114 n=4+4) SiteNew/Tags_and_categories-16 14.3MB ± 0% 13.2MB ± 0% -7.30% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 69.1MB ± 0% 69.0MB ± 0% ~ (p=0.343 n=4+4) SiteNew/Deep_content_tree-16 31.3MB ± 0% 31.8MB ± 0% +1.49% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 10.8MB ± 0% 10.9MB ± 0% +1.11% (p=0.029 n=4+4) SiteNew/Page_collections-16 21.4MB ± 0% 21.6MB ± 0% +1.15% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Bundle_with_image/Edit-16 4.74k ± 0% 3.86k ± 0% -18.57% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 4.73k ± 0% 3.85k ± 0% -18.58% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 301k ± 0% 198k ± 0% -34.14% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 389k ± 0% 373k ± 0% -4.07% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 338k ± 0% 262k ± 0% -22.63% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 102k ± 0% 88k ± 0% -13.81% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 176k ± 0% 152k ± 0% -13.32% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 273k ± 0% 245k ± 0% -10.36% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 396k ± 0% 398k ± 0% +0.39% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 317k ± 0% 325k ± 0% +2.53% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 146k ± 0% 147k ± 0% +0.98% (p=0.029 n=4+4) SiteNew/Page_collections-16 210k ± 0% 215k ± 0% +2.44% (p=0.029 n=4+4) ``` Fixes #6312 Fixes #6087 Fixes #6738 Fixes #6412 Fixes #6743 Fixes #6875 Fixes #6034 Fixes #6902 Fixes #6173 Fixes #6590
149 lines
4.4 KiB
Go
149 lines
4.4 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 create
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/source"
|
|
|
|
"github.com/gohugoio/hugo/hugolib"
|
|
"github.com/gohugoio/hugo/tpl"
|
|
"github.com/spf13/afero"
|
|
)
|
|
|
|
// ArchetypeFileData represents the data available to an archetype template.
|
|
type ArchetypeFileData struct {
|
|
// The archetype content type, either given as --kind option or extracted
|
|
// from the target path's section, i.e. "blog/mypost.md" will resolve to
|
|
// "blog".
|
|
Type string
|
|
|
|
// The current date and time as a RFC3339 formatted string, suitable for use in front matter.
|
|
Date string
|
|
|
|
// The Site, fully equipped with all the pages etc. Note: This will only be set if it is actually
|
|
// used in the archetype template. Also, if this is a multilingual setup,
|
|
// this site is the site that best matches the target content file, based
|
|
// on the presence of language code in the filename.
|
|
Site *hugolib.SiteInfo
|
|
|
|
// Name will in most cases be the same as TranslationBaseName, e.g. "my-post".
|
|
// But if that value is "index" (bundles), the Name is instead the owning folder.
|
|
// This is the value you in most cases would want to use to construct the title in your
|
|
// archetype template.
|
|
Name string
|
|
|
|
// The target content file. Note that the .Content will be empty, as that
|
|
// has not been created yet.
|
|
source.File
|
|
}
|
|
|
|
const (
|
|
// ArchetypeTemplateTemplate is used as initial template when adding an archetype template.
|
|
ArchetypeTemplateTemplate = `---
|
|
title: "{{ replace .Name "-" " " | title }}"
|
|
date: {{ .Date }}
|
|
draft: true
|
|
---
|
|
|
|
`
|
|
)
|
|
|
|
var (
|
|
archetypeShortcodeReplacementsPre = strings.NewReplacer(
|
|
"{{<", "{x{<",
|
|
"{{%", "{x{%",
|
|
">}}", ">}x}",
|
|
"%}}", "%}x}")
|
|
|
|
archetypeShortcodeReplacementsPost = strings.NewReplacer(
|
|
"{x{<", "{{<",
|
|
"{x{%", "{{%",
|
|
">}x}", ">}}",
|
|
"%}x}", "%}}")
|
|
)
|
|
|
|
func executeArcheTypeAsTemplate(s *hugolib.Site, name, kind, targetPath, archetypeFilename string) ([]byte, error) {
|
|
|
|
var (
|
|
archetypeContent []byte
|
|
archetypeTemplate []byte
|
|
err error
|
|
)
|
|
|
|
f, err := s.SourceSpec.NewFileInfoFrom(targetPath, targetPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if name == "" {
|
|
name = f.TranslationBaseName()
|
|
|
|
if name == "index" || name == "_index" {
|
|
// Page bundles; the directory name will hopefully have a better name.
|
|
dir := strings.TrimSuffix(f.Dir(), helpers.FilePathSeparator)
|
|
_, name = filepath.Split(dir)
|
|
}
|
|
}
|
|
|
|
data := ArchetypeFileData{
|
|
Type: kind,
|
|
Date: time.Now().Format(time.RFC3339),
|
|
Name: name,
|
|
File: f,
|
|
Site: s.Info,
|
|
}
|
|
|
|
if archetypeFilename == "" {
|
|
// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
|
|
archetypeTemplate = []byte(ArchetypeTemplateTemplate)
|
|
} else {
|
|
archetypeTemplate, err = afero.ReadFile(s.BaseFs.Archetypes.Fs, archetypeFilename)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to read archetype file %s", err)
|
|
}
|
|
|
|
}
|
|
|
|
// The archetype template may contain shortcodes, and these does not play well
|
|
// with the Go templates. Need to set some temporary delimiters.
|
|
archetypeTemplate = []byte(archetypeShortcodeReplacementsPre.Replace(string(archetypeTemplate)))
|
|
|
|
// Reuse the Hugo template setup to get the template funcs properly set up.
|
|
templateHandler := s.Deps.Tmpl().(tpl.TemplateManager)
|
|
templateName := helpers.Filename(archetypeFilename)
|
|
if err := templateHandler.AddTemplate("_text/"+templateName, string(archetypeTemplate)); err != nil {
|
|
return nil, errors.Wrapf(err, "Failed to parse archetype file %q:", archetypeFilename)
|
|
}
|
|
|
|
templ, _ := templateHandler.Lookup(templateName)
|
|
|
|
var buff bytes.Buffer
|
|
if err := templateHandler.Execute(templ, &buff, data); err != nil {
|
|
return nil, errors.Wrapf(err, "Failed to process archetype file %q:", archetypeFilename)
|
|
}
|
|
|
|
archetypeContent = []byte(archetypeShortcodeReplacementsPost.Replace(buff.String()))
|
|
|
|
return archetypeContent, nil
|
|
|
|
}
|