mirror of
				https://github.com/gohugoio/hugo.git
				synced 2024-05-11 05:54:58 +00:00 
			
		
		
		
	This commit is not the smallest in Hugo's history. Some hightlights include: * Page bundles (for complete articles, keeping images and content together etc.). * Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`. * Processed images are cached inside `resources/_gen/images` (default) in your project. * Symbolic links (both files and dirs) are now allowed anywhere inside /content * A new table based build summary * The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below). A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory: ```bash ▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render" benchmark old ns/op new ns/op delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86% benchmark old allocs new allocs delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30% benchmark old bytes new bytes delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64% ``` Fixes #3651 Closes #3158 Fixes #1014 Closes #2021 Fixes #1240 Updates #3757
		
			
				
	
	
		
			137 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			137 lines
		
	
	
		
			4.2 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"
 | 
						|
	"strings"
 | 
						|
	"time"
 | 
						|
 | 
						|
	"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.Site
 | 
						|
 | 
						|
	// 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 .TranslationBaseName "-" " " | 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, kind, targetPath, archetypeFilename string) ([]byte, error) {
 | 
						|
 | 
						|
	var (
 | 
						|
		archetypeContent  []byte
 | 
						|
		archetypeTemplate []byte
 | 
						|
		err               error
 | 
						|
	)
 | 
						|
 | 
						|
	sp := source.NewSourceSpec(s.Deps.Cfg, s.Deps.Fs)
 | 
						|
	f := sp.NewFileInfo("", targetPath, nil)
 | 
						|
 | 
						|
	data := ArchetypeFileData{
 | 
						|
		Type: kind,
 | 
						|
		Date: time.Now().Format(time.RFC3339),
 | 
						|
		File: f,
 | 
						|
		Site: s,
 | 
						|
	}
 | 
						|
 | 
						|
	if archetypeFilename == "" {
 | 
						|
		// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
 | 
						|
		archetypeTemplate = []byte(ArchetypeTemplateTemplate)
 | 
						|
	} else {
 | 
						|
		archetypeTemplate, err = afero.ReadFile(s.Fs.Source, archetypeFilename)
 | 
						|
		if err != nil {
 | 
						|
			return nil, fmt.Errorf("Failed to read archetype file %q: %s", archetypeFilename, 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.TemplateHandler)
 | 
						|
	templateName := "_text/" + helpers.Filename(archetypeFilename)
 | 
						|
	if err := templateHandler.AddTemplate(templateName, string(archetypeTemplate)); err != nil {
 | 
						|
		return nil, fmt.Errorf("Failed to parse archetype file %q: %s", archetypeFilename, err)
 | 
						|
	}
 | 
						|
 | 
						|
	templ := templateHandler.Lookup(templateName)
 | 
						|
 | 
						|
	var buff bytes.Buffer
 | 
						|
	if err := templ.Execute(&buff, data); err != nil {
 | 
						|
		return nil, fmt.Errorf("Failed to process archetype file %q: %s", archetypeFilename, err)
 | 
						|
	}
 | 
						|
 | 
						|
	archetypeContent = []byte(archetypeShortcodeReplacementsPost.Replace(buff.String()))
 | 
						|
 | 
						|
	if !bytes.Contains(archetypeContent, []byte("date")) || !bytes.Contains(archetypeContent, []byte("title")) {
 | 
						|
		// TODO(bep) remove some time in the future.
 | 
						|
		s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q.
 | 
						|
From Hugo 0.24 this must be provided in the archetype file itself, if needed. Example:
 | 
						|
%s
 | 
						|
`, archetypeFilename, ArchetypeTemplateTemplate))
 | 
						|
 | 
						|
	}
 | 
						|
 | 
						|
	return archetypeContent, nil
 | 
						|
 | 
						|
}
 |