2019-01-02 06:33:26 -05:00
|
|
|
// Copyright 2019 The Hugo Authors. All rights reserved.
|
2016-11-03 19:34:25 -04:00
|
|
|
//
|
|
|
|
// 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 hugolib
|
|
|
|
|
2017-05-25 05:32:02 -04:00
|
|
|
import (
|
2018-05-29 21:35:27 -04:00
|
|
|
"fmt"
|
2017-05-25 05:32:02 -04:00
|
|
|
"path"
|
2018-07-19 12:26:10 -04:00
|
|
|
"path/filepath"
|
2019-08-03 11:27:40 -04:00
|
|
|
"sort"
|
2018-01-24 03:47:30 -05:00
|
|
|
"strings"
|
2019-01-02 06:33:26 -05:00
|
|
|
"sync"
|
2019-08-03 11:27:40 -04:00
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/resources/resource"
|
2019-01-02 06:33:26 -05:00
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
2017-05-25 14:13:03 -04:00
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
"github.com/gohugoio/hugo/cache"
|
2018-07-19 17:02:33 -04:00
|
|
|
"github.com/gohugoio/hugo/helpers"
|
2019-01-02 06:33:26 -05:00
|
|
|
"github.com/gohugoio/hugo/resources/page"
|
2017-05-25 05:32:02 -04:00
|
|
|
)
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Used in the page cache to mark more than one hit for a given key.
|
|
|
|
var ambiguityFlag = &pageState{}
|
|
|
|
|
2016-11-11 03:01:47 -05:00
|
|
|
// PageCollections contains the page collections for a site.
|
2016-11-03 19:34:25 -04:00
|
|
|
type PageCollections struct {
|
2019-08-03 11:27:40 -04:00
|
|
|
pagesMap *pagesMap
|
2016-11-03 19:34:25 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Includes absolute all pages (of all types), including drafts etc.
|
|
|
|
rawAllPages pageStatePages
|
2016-11-03 19:34:25 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// rawAllPages plus additional pages created during the build process.
|
|
|
|
workAllPages pageStatePages
|
2016-11-03 19:34:25 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Includes headless bundles, i.e. bundles that produce no output for its content page.
|
|
|
|
headlessPages pageStatePages
|
2016-11-03 19:34:25 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Lazy initialized page collections
|
|
|
|
pages *lazyPagesFactory
|
|
|
|
regularPages *lazyPagesFactory
|
|
|
|
allPages *lazyPagesFactory
|
|
|
|
allRegularPages *lazyPagesFactory
|
2016-11-16 15:06:10 -05:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// The index for .Site.GetPage etc.
|
|
|
|
pageIndex *cache.Lazy
|
|
|
|
}
|
2017-05-25 14:13:03 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Pages returns all pages.
|
|
|
|
// This is for the current language only.
|
|
|
|
func (c *PageCollections) Pages() page.Pages {
|
|
|
|
return c.pages.get()
|
|
|
|
}
|
2018-01-23 08:02:54 -05:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// RegularPages returns all the regular pages.
|
|
|
|
// This is for the current language only.
|
|
|
|
func (c *PageCollections) RegularPages() page.Pages {
|
|
|
|
return c.regularPages.get()
|
|
|
|
}
|
|
|
|
|
|
|
|
// AllPages returns all pages for all languages.
|
|
|
|
func (c *PageCollections) AllPages() page.Pages {
|
|
|
|
return c.allPages.get()
|
|
|
|
}
|
|
|
|
|
|
|
|
// AllPages returns all regular pages for all languages.
|
|
|
|
func (c *PageCollections) AllRegularPages() page.Pages {
|
|
|
|
return c.allRegularPages.get()
|
2018-05-29 21:35:27 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get initializes the index if not already done so, then
|
|
|
|
// looks up the given page ref, returns nil if no value found.
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) getFromCache(ref string) (page.Page, error) {
|
2018-07-17 05:18:29 -04:00
|
|
|
v, found, err := c.pageIndex.Get(ref)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
p := v.(page.Page)
|
2018-07-17 05:18:29 -04:00
|
|
|
|
|
|
|
if p != ambiguityFlag {
|
|
|
|
return p, nil
|
|
|
|
}
|
|
|
|
return nil, fmt.Errorf("page reference %q is ambiguous", ref)
|
2018-05-29 21:35:27 -04:00
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
type lazyPagesFactory struct {
|
|
|
|
pages page.Pages
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
init sync.Once
|
|
|
|
factory page.PagesFactory
|
|
|
|
}
|
2016-11-07 14:24:37 -05:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (l *lazyPagesFactory) get() page.Pages {
|
|
|
|
l.init.Do(func() {
|
|
|
|
l.pages = l.factory()
|
|
|
|
})
|
|
|
|
return l.pages
|
|
|
|
}
|
|
|
|
|
|
|
|
func newLazyPagesFactory(factory page.PagesFactory) *lazyPagesFactory {
|
|
|
|
return &lazyPagesFactory{factory: factory}
|
|
|
|
}
|
|
|
|
|
|
|
|
func newPageCollections() *PageCollections {
|
|
|
|
return newPageCollectionsFromPages(nil)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newPageCollectionsFromPages(pages pageStatePages) *PageCollections {
|
|
|
|
|
|
|
|
c := &PageCollections{rawAllPages: pages}
|
|
|
|
|
|
|
|
c.pages = newLazyPagesFactory(func() page.Pages {
|
|
|
|
pages := make(page.Pages, len(c.workAllPages))
|
|
|
|
for i, p := range c.workAllPages {
|
|
|
|
pages[i] = p
|
|
|
|
}
|
|
|
|
return pages
|
|
|
|
})
|
|
|
|
|
|
|
|
c.regularPages = newLazyPagesFactory(func() page.Pages {
|
|
|
|
return c.findPagesByKindInWorkPages(page.KindPage, c.workAllPages)
|
|
|
|
})
|
|
|
|
|
|
|
|
c.pageIndex = cache.NewLazy(func() (map[string]interface{}, error) {
|
2018-07-17 05:18:29 -04:00
|
|
|
index := make(map[string]interface{})
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
add := func(ref string, p page.Page) {
|
|
|
|
ref = strings.ToLower(ref)
|
2018-07-17 05:18:29 -04:00
|
|
|
existing := index[ref]
|
|
|
|
if existing == nil {
|
|
|
|
index[ref] = p
|
|
|
|
} else if existing != ambiguityFlag && existing != p {
|
|
|
|
index[ref] = ambiguityFlag
|
|
|
|
}
|
|
|
|
}
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
for _, pageCollection := range []pageStatePages{c.workAllPages, c.headlessPages} {
|
2018-05-29 21:35:27 -04:00
|
|
|
for _, p := range pageCollection {
|
2019-01-02 06:33:26 -05:00
|
|
|
if p.IsPage() {
|
|
|
|
sourceRef := p.sourceRef()
|
|
|
|
if sourceRef != "" {
|
|
|
|
// index the canonical ref
|
|
|
|
// e.g. /section/article.md
|
|
|
|
add(sourceRef, p)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ref/Relref supports this potentially ambiguous lookup.
|
|
|
|
add(p.File().LogicalName(), p)
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
translationBaseName := p.File().TranslationBaseName()
|
2018-07-17 05:18:29 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
dir, _ := path.Split(sourceRef)
|
|
|
|
dir = strings.TrimSuffix(dir, "/")
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
if translationBaseName == "index" {
|
|
|
|
add(dir, p)
|
|
|
|
add(path.Base(dir), p)
|
|
|
|
} else {
|
|
|
|
add(translationBaseName, p)
|
|
|
|
}
|
2018-01-17 13:26:34 -05:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// We need a way to get to the current language version.
|
|
|
|
pathWithNoExtensions := path.Join(dir, translationBaseName)
|
|
|
|
add(pathWithNoExtensions, p)
|
2018-07-17 15:44:08 -04:00
|
|
|
} else {
|
2019-01-02 06:33:26 -05:00
|
|
|
// index the canonical, unambiguous ref for any backing file
|
|
|
|
// e.g. /section/_index.md
|
|
|
|
sourceRef := p.sourceRef()
|
|
|
|
if sourceRef != "" {
|
|
|
|
add(sourceRef, p)
|
|
|
|
}
|
|
|
|
|
|
|
|
ref := p.SectionsPath()
|
|
|
|
|
|
|
|
// index the canonical, unambiguous virtual ref
|
|
|
|
// e.g. /section
|
|
|
|
// (this may already have been indexed above)
|
|
|
|
add("/"+ref, p)
|
2017-05-25 14:13:03 -04:00
|
|
|
}
|
2017-05-25 05:32:02 -04:00
|
|
|
}
|
2016-11-07 14:24:37 -05:00
|
|
|
}
|
2017-05-22 18:20:31 -04:00
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
return index, nil
|
2019-01-02 06:33:26 -05:00
|
|
|
})
|
2018-07-17 05:18:29 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
return c
|
2017-05-25 14:13:03 -04:00
|
|
|
}
|
2017-05-22 18:20:31 -04:00
|
|
|
|
2018-07-19 12:26:10 -04:00
|
|
|
// This is an adapter func for the old API with Kind as first argument.
|
|
|
|
// This is invoked when you do .Site.GetPage. We drop the Kind and fails
|
|
|
|
// if there are more than 2 arguments, which would be ambigous.
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) getPageOldVersion(ref ...string) (page.Page, error) {
|
2018-07-19 12:26:10 -04:00
|
|
|
var refs []string
|
|
|
|
for _, r := range ref {
|
|
|
|
// A common construct in the wild is
|
|
|
|
// .Site.GetPage "home" "" or
|
|
|
|
// .Site.GetPage "home" "/"
|
|
|
|
if r != "" && r != "/" {
|
|
|
|
refs = append(refs, r)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var key string
|
|
|
|
|
|
|
|
if len(refs) > 2 {
|
|
|
|
// This was allowed in Hugo <= 0.44, but we cannot support this with the
|
|
|
|
// new API. This should be the most unusual case.
|
|
|
|
return nil, fmt.Errorf(`too many arguments to .Site.GetPage: %v. Use lookups on the form {{ .Site.GetPage "/posts/mypage-md" }}`, ref)
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
if len(refs) == 0 || refs[0] == page.KindHome {
|
2018-07-19 12:26:10 -04:00
|
|
|
key = "/"
|
|
|
|
} else if len(refs) == 1 {
|
2019-01-02 06:33:26 -05:00
|
|
|
if len(ref) == 2 && refs[0] == page.KindSection {
|
2018-07-24 04:10:51 -04:00
|
|
|
// This is an old style reference to the "Home Page section".
|
|
|
|
// Typically fetched via {{ .Site.GetPage "section" .Section }}
|
|
|
|
// See https://github.com/gohugoio/hugo/issues/4989
|
|
|
|
key = "/"
|
|
|
|
} else {
|
|
|
|
key = refs[0]
|
|
|
|
}
|
2018-07-19 12:26:10 -04:00
|
|
|
} else {
|
|
|
|
key = refs[1]
|
|
|
|
}
|
|
|
|
|
|
|
|
key = filepath.ToSlash(key)
|
|
|
|
if !strings.HasPrefix(key, "/") {
|
|
|
|
key = "/" + key
|
|
|
|
}
|
|
|
|
|
|
|
|
return c.getPageNew(nil, key)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Only used in tests.
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) getPage(typ string, sections ...string) page.Page {
|
2018-07-19 12:26:10 -04:00
|
|
|
refs := append([]string{typ}, path.Join(sections...))
|
|
|
|
p, _ := c.getPageOldVersion(refs...)
|
2018-07-17 05:18:29 -04:00
|
|
|
return p
|
|
|
|
}
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Case insensitive page lookup.
|
|
|
|
func (c *PageCollections) getPageNew(context page.Page, ref string) (page.Page, error) {
|
2018-09-05 04:31:15 -04:00
|
|
|
var anError error
|
2017-05-22 18:20:31 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
ref = strings.ToLower(ref)
|
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
// Absolute (content root relative) reference.
|
|
|
|
if strings.HasPrefix(ref, "/") {
|
2018-09-05 04:31:15 -04:00
|
|
|
p, err := c.getFromCache(ref)
|
|
|
|
if err == nil && p != nil {
|
2018-07-17 05:18:29 -04:00
|
|
|
return p, nil
|
|
|
|
}
|
2018-09-05 04:31:15 -04:00
|
|
|
if err != nil {
|
|
|
|
anError = err
|
|
|
|
}
|
|
|
|
|
2018-07-19 11:47:05 -04:00
|
|
|
} else if context != nil {
|
|
|
|
// Try the page-relative path.
|
2019-01-02 06:33:26 -05:00
|
|
|
ppath := path.Join("/", strings.ToLower(context.SectionsPath()), ref)
|
2018-09-05 04:31:15 -04:00
|
|
|
p, err := c.getFromCache(ppath)
|
|
|
|
if err == nil && p != nil {
|
2018-07-17 05:18:29 -04:00
|
|
|
return p, nil
|
|
|
|
}
|
2018-09-05 04:31:15 -04:00
|
|
|
if err != nil {
|
|
|
|
anError = err
|
|
|
|
}
|
2018-07-17 05:18:29 -04:00
|
|
|
}
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
if !strings.HasPrefix(ref, "/") {
|
|
|
|
// Many people will have "post/foo.md" in their content files.
|
2018-09-05 04:31:15 -04:00
|
|
|
p, err := c.getFromCache("/" + ref)
|
|
|
|
if err == nil && p != nil {
|
2018-07-19 17:02:33 -04:00
|
|
|
if context != nil {
|
|
|
|
// TODO(bep) remove this case and the message below when the storm has passed
|
2019-06-26 02:26:02 -04:00
|
|
|
err := wrapErr(errors.Errorf(`make non-relative ref/relref page reference(s) in page %q absolute, e.g. {{< ref "/blog/my-post.md" >}}`, context.Path()), context)
|
2019-01-02 06:33:26 -05:00
|
|
|
helpers.DistinctWarnLog.Println(err)
|
2018-07-19 17:02:33 -04:00
|
|
|
}
|
2018-07-17 05:18:29 -04:00
|
|
|
return p, nil
|
2018-05-29 21:35:27 -04:00
|
|
|
}
|
2018-09-05 04:31:15 -04:00
|
|
|
if err != nil {
|
|
|
|
anError = err
|
|
|
|
}
|
2018-07-17 05:18:29 -04:00
|
|
|
}
|
2018-05-29 21:35:27 -04:00
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
// Last try.
|
|
|
|
ref = strings.TrimPrefix(ref, "/")
|
2018-07-19 14:55:16 -04:00
|
|
|
p, err := c.getFromCache(ref)
|
2018-07-17 05:18:29 -04:00
|
|
|
if err != nil {
|
2018-09-05 04:31:15 -04:00
|
|
|
anError = err
|
|
|
|
}
|
|
|
|
|
|
|
|
if p == nil && anError != nil {
|
2019-01-02 06:33:26 -05:00
|
|
|
return nil, wrapErr(errors.Wrap(anError, "failed to resolve ref"), context)
|
2017-05-25 14:13:03 -04:00
|
|
|
}
|
2017-05-22 18:20:31 -04:00
|
|
|
|
2018-07-19 14:55:16 -04:00
|
|
|
return p, nil
|
2016-11-07 14:24:37 -05:00
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (*PageCollections) findPagesByKindIn(kind string, inPages page.Pages) page.Pages {
|
|
|
|
var pages page.Pages
|
2016-11-03 19:34:25 -04:00
|
|
|
for _, p := range inPages {
|
2019-01-02 06:33:26 -05:00
|
|
|
if p.Kind() == kind {
|
2016-11-03 19:34:25 -04:00
|
|
|
pages = append(pages, p)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pages
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) findPagesByKind(kind string) page.Pages {
|
|
|
|
return c.findPagesByKindIn(kind, c.Pages())
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *PageCollections) findWorkPagesByKind(kind string) pageStatePages {
|
|
|
|
var pages pageStatePages
|
|
|
|
for _, p := range c.workAllPages {
|
|
|
|
if p.Kind() == kind {
|
|
|
|
pages = append(pages, p)
|
2018-02-25 04:50:44 -05:00
|
|
|
}
|
|
|
|
}
|
2019-01-02 06:33:26 -05:00
|
|
|
return pages
|
2018-02-25 04:50:44 -05:00
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (*PageCollections) findPagesByKindInWorkPages(kind string, inPages pageStatePages) page.Pages {
|
|
|
|
var pages page.Pages
|
2016-11-03 19:34:25 -04:00
|
|
|
for _, p := range inPages {
|
2019-01-02 06:33:26 -05:00
|
|
|
if p.Kind() == kind {
|
2016-11-03 19:34:25 -04:00
|
|
|
pages = append(pages, p)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pages
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) addPage(page *pageState) {
|
2016-11-03 19:34:25 -04:00
|
|
|
c.rawAllPages = append(c.rawAllPages, page)
|
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
func (c *PageCollections) removePageFilename(filename string) {
|
|
|
|
if i := c.rawAllPages.findPagePosByFilename(filename); i >= 0 {
|
:sparkles: Implement Page bundling and image handling
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
2017-07-24 03:00:23 -04:00
|
|
|
c.clearResourceCacheForPage(c.rawAllPages[i])
|
2016-11-03 19:34:25 -04:00
|
|
|
c.rawAllPages = append(c.rawAllPages[:i], c.rawAllPages[i+1:]...)
|
|
|
|
}
|
:sparkles: Implement Page bundling and image handling
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
2017-07-24 03:00:23 -04:00
|
|
|
|
2016-11-03 19:34:25 -04:00
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) removePage(page *pageState) {
|
2017-06-08 16:32:01 -04:00
|
|
|
if i := c.rawAllPages.findPagePos(page); i >= 0 {
|
:sparkles: Implement Page bundling and image handling
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
2017-07-24 03:00:23 -04:00
|
|
|
c.clearResourceCacheForPage(c.rawAllPages[i])
|
2016-11-03 19:34:25 -04:00
|
|
|
c.rawAllPages = append(c.rawAllPages[:i], c.rawAllPages[i+1:]...)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) findPagesByShortcode(shortcode string) page.Pages {
|
|
|
|
var pages page.Pages
|
2017-03-10 14:54:50 -05:00
|
|
|
for _, p := range c.rawAllPages {
|
2019-01-02 06:33:26 -05:00
|
|
|
if p.HasShortcode(shortcode) {
|
|
|
|
pages = append(pages, p)
|
2017-03-10 14:54:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return pages
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) replacePage(page *pageState) {
|
2016-11-03 19:34:25 -04:00
|
|
|
// will find existing page that matches filepath and remove it
|
|
|
|
c.removePage(page)
|
|
|
|
c.addPage(page)
|
|
|
|
}
|
:sparkles: Implement Page bundling and image handling
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
2017-07-24 03:00:23 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
func (c *PageCollections) clearResourceCacheForPage(page *pageState) {
|
|
|
|
if len(page.resources) > 0 {
|
|
|
|
page.s.ResourceSpec.DeleteCacheByPrefix(page.targetPaths().SubResourceBaseTarget)
|
:sparkles: Implement Page bundling and image handling
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
2017-07-24 03:00:23 -04:00
|
|
|
}
|
|
|
|
}
|
2019-08-03 11:27:40 -04:00
|
|
|
|
|
|
|
func (c *PageCollections) assemblePagesMap(s *Site) error {
|
|
|
|
c.pagesMap = newPagesMap(s)
|
|
|
|
|
|
|
|
rootSections := make(map[string]bool)
|
|
|
|
|
|
|
|
// Add all branch nodes first.
|
|
|
|
for _, p := range c.rawAllPages {
|
|
|
|
rootSections[p.Section()] = true
|
|
|
|
if p.IsPage() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
c.pagesMap.addPage(p)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create missing home page and the first level sections if no
|
|
|
|
// _index provided.
|
|
|
|
s.home = c.pagesMap.getOrCreateHome()
|
|
|
|
for k := range rootSections {
|
|
|
|
c.pagesMap.createSectionIfNotExists(k)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attach the regular pages to their section.
|
|
|
|
for _, p := range c.rawAllPages {
|
|
|
|
if p.IsNode() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
c.pagesMap.addPage(p)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *PageCollections) createWorkAllPages() error {
|
|
|
|
c.workAllPages = make(pageStatePages, 0, len(c.rawAllPages))
|
|
|
|
c.headlessPages = make(pageStatePages, 0)
|
|
|
|
|
|
|
|
var (
|
|
|
|
homeDates *resource.Dates
|
|
|
|
sectionDates *resource.Dates
|
|
|
|
siteLastmod time.Time
|
|
|
|
siteLastDate time.Time
|
|
|
|
|
|
|
|
sectionsParamId = "mainSections"
|
|
|
|
sectionsParamIdLower = strings.ToLower(sectionsParamId)
|
|
|
|
)
|
|
|
|
|
|
|
|
mainSections, mainSectionsFound := c.pagesMap.s.Info.Params()[sectionsParamIdLower]
|
|
|
|
|
|
|
|
var (
|
|
|
|
bucketsToRemove []string
|
|
|
|
rootBuckets []*pagesMapBucket
|
|
|
|
)
|
|
|
|
|
|
|
|
c.pagesMap.r.Walk(func(s string, v interface{}) bool {
|
|
|
|
bucket := v.(*pagesMapBucket)
|
|
|
|
var parentBucket *pagesMapBucket
|
|
|
|
|
|
|
|
if s != "/" {
|
|
|
|
_, parentv, found := c.pagesMap.r.LongestPrefix(path.Dir(s))
|
|
|
|
if !found {
|
|
|
|
panic(fmt.Sprintf("[BUG] parent bucket not found for %q", s))
|
|
|
|
}
|
|
|
|
parentBucket = parentv.(*pagesMapBucket)
|
|
|
|
|
|
|
|
if !mainSectionsFound && strings.Count(s, "/") == 1 {
|
|
|
|
// Root section
|
|
|
|
rootBuckets = append(rootBuckets, bucket)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if bucket.owner.IsHome() {
|
|
|
|
if resource.IsZeroDates(bucket.owner) {
|
|
|
|
// Calculate dates from the page tree.
|
|
|
|
homeDates = &bucket.owner.m.Dates
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sectionDates = nil
|
|
|
|
if resource.IsZeroDates(bucket.owner) {
|
|
|
|
sectionDates = &bucket.owner.m.Dates
|
|
|
|
}
|
|
|
|
|
|
|
|
if parentBucket != nil {
|
|
|
|
bucket.parent = parentBucket
|
|
|
|
if bucket.owner.IsSection() {
|
|
|
|
parentBucket.bucketSections = append(parentBucket.bucketSections, bucket)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp := bucket.pages[:0]
|
|
|
|
for _, x := range bucket.pages {
|
|
|
|
if c.pagesMap.s.shouldBuild(x) {
|
|
|
|
tmp = append(tmp, x)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
bucket.pages = tmp
|
|
|
|
|
|
|
|
if bucket.isEmpty() {
|
|
|
|
if bucket.owner.IsSection() && bucket.owner.File().IsZero() {
|
|
|
|
// Check for any nested section.
|
|
|
|
var hasDescendant bool
|
|
|
|
c.pagesMap.r.WalkPrefix(s, func(ss string, v interface{}) bool {
|
|
|
|
if s != ss {
|
|
|
|
hasDescendant = true
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
if !hasDescendant {
|
|
|
|
// This is an auto-created section with, now, nothing in it.
|
|
|
|
bucketsToRemove = append(bucketsToRemove, s)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bucket.disabled {
|
|
|
|
c.workAllPages = append(c.workAllPages, bucket.owner)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bucket.view {
|
|
|
|
for _, p := range bucket.pages {
|
|
|
|
ps := p.(*pageState)
|
|
|
|
ps.parent = bucket.owner
|
|
|
|
if ps.m.headless {
|
|
|
|
c.headlessPages = append(c.headlessPages, ps)
|
|
|
|
} else {
|
|
|
|
c.workAllPages = append(c.workAllPages, ps)
|
|
|
|
}
|
|
|
|
|
|
|
|
if homeDates != nil {
|
|
|
|
homeDates.UpdateDateAndLastmodIfAfter(ps)
|
|
|
|
}
|
|
|
|
|
|
|
|
if sectionDates != nil {
|
|
|
|
sectionDates.UpdateDateAndLastmodIfAfter(ps)
|
|
|
|
}
|
|
|
|
|
|
|
|
if p.Lastmod().After(siteLastmod) {
|
|
|
|
siteLastmod = p.Lastmod()
|
|
|
|
}
|
|
|
|
if p.Date().After(siteLastDate) {
|
|
|
|
siteLastDate = p.Date()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
|
|
|
|
c.pagesMap.s.lastmod = siteLastmod
|
|
|
|
|
|
|
|
if !mainSectionsFound {
|
|
|
|
|
|
|
|
// Calculare main section
|
|
|
|
var (
|
|
|
|
maxRootBucketWeight int
|
|
|
|
maxRootBucket *pagesMapBucket
|
|
|
|
)
|
|
|
|
|
|
|
|
for _, b := range rootBuckets {
|
|
|
|
weight := len(b.pages) + (len(b.bucketSections) * 5)
|
|
|
|
if weight >= maxRootBucketWeight {
|
|
|
|
maxRootBucket = b
|
|
|
|
maxRootBucketWeight = weight
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if maxRootBucket != nil {
|
|
|
|
// Try to make this as backwards compatible as possible.
|
|
|
|
mainSections = []string{maxRootBucket.owner.Section()}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
c.pagesMap.s.Info.Params()[sectionsParamId] = mainSections
|
|
|
|
c.pagesMap.s.Info.Params()[sectionsParamIdLower] = mainSections
|
|
|
|
|
|
|
|
for _, key := range bucketsToRemove {
|
|
|
|
c.pagesMap.r.Delete(key)
|
|
|
|
}
|
|
|
|
|
|
|
|
sort.Sort(c.workAllPages)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|