2017-03-06 13:16:31 -05:00
|
|
|
// 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 hugolib
|
|
|
|
|
|
|
|
import (
|
2017-03-22 04:54:56 -04:00
|
|
|
"fmt"
|
2017-03-19 10:25:32 -04:00
|
|
|
"html/template"
|
: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
|
|
|
"os"
|
2017-03-21 19:25:55 -04:00
|
|
|
"strings"
|
2017-03-09 13:19:29 -05:00
|
|
|
"sync"
|
|
|
|
|
: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
|
|
|
"github.com/gohugoio/hugo/resource"
|
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/media"
|
2017-03-22 06:03:42 -04:00
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/gohugoio/hugo/output"
|
2017-03-06 13:16:31 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
// PageOutput represents one of potentially many output formats of a given
|
|
|
|
// Page.
|
|
|
|
type PageOutput struct {
|
|
|
|
*Page
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// Pagination
|
|
|
|
paginator *Pager
|
|
|
|
paginatorInit sync.Once
|
|
|
|
|
: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
|
|
|
// Page output specific resources
|
|
|
|
resources resource.Resources
|
|
|
|
resourcesInit sync.Once
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// Keep this to create URL/path variations, i.e. paginators.
|
|
|
|
targetPathDescriptor targetPathDescriptor
|
|
|
|
|
2017-03-16 03:32:14 -04:00
|
|
|
outputFormat output.Format
|
2017-03-06 13:16:31 -05:00
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
func (p *PageOutput) targetPath(addends ...string) (string, error) {
|
2017-11-12 04:03:56 -05:00
|
|
|
tp, err := p.createTargetPath(p.outputFormat, false, addends...)
|
2017-03-09 13:19:29 -05:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return tp, nil
|
|
|
|
}
|
|
|
|
|
2018-05-08 04:10:13 -04:00
|
|
|
func newPageOutput(p *Page, createCopy, initContent bool, f output.Format) (*PageOutput, error) {
|
2017-03-25 13:28:38 -04:00
|
|
|
// TODO(bep) This is only needed for tests and we should get rid of it.
|
2017-03-17 11:35:09 -04:00
|
|
|
if p.targetPathDescriptorPrototype == nil {
|
: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
|
|
|
if err := p.initPaths(); err != nil {
|
2017-03-17 11:35:09 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-07 03:55:17 -05:00
|
|
|
if createCopy {
|
2018-05-08 04:10:13 -04:00
|
|
|
p = p.copy(initContent)
|
2017-03-07 03:55:17 -05:00
|
|
|
}
|
2017-03-09 13:19:29 -05:00
|
|
|
|
2017-03-16 03:32:14 -04:00
|
|
|
td, err := p.createTargetPathDescriptor(f)
|
2017-03-09 13:19:29 -05:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return &PageOutput{
|
|
|
|
Page: p,
|
2017-03-16 03:32:14 -04:00
|
|
|
outputFormat: f,
|
2017-03-09 13:19:29 -05:00
|
|
|
targetPathDescriptor: td,
|
|
|
|
}, nil
|
2017-03-06 13:16:31 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// copy creates a copy of this PageOutput with the lazy sync.Once vars reset
|
|
|
|
// so they will be evaluated again, for word count calculations etc.
|
2018-05-08 04:10:13 -04:00
|
|
|
func (p *PageOutput) copyWithFormat(f output.Format, initContent bool) (*PageOutput, error) {
|
|
|
|
c, err := newPageOutput(p.Page, true, initContent, f)
|
2017-03-09 13:19:29 -05:00
|
|
|
if err != nil {
|
2017-04-12 12:11:37 -04:00
|
|
|
return nil, err
|
2017-03-09 13:19:29 -05:00
|
|
|
}
|
2017-04-12 07:00:44 -04:00
|
|
|
c.paginator = p.paginator
|
2017-04-12 12:11:37 -04:00
|
|
|
return c, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *PageOutput) copy() (*PageOutput, error) {
|
2018-05-08 04:10:13 -04:00
|
|
|
return p.copyWithFormat(p.outputFormat, false)
|
2017-03-06 13:16:31 -05:00
|
|
|
}
|
2017-03-19 10:25:32 -04:00
|
|
|
|
2017-03-26 13:34:30 -04:00
|
|
|
func (p *PageOutput) layouts(layouts ...string) ([]string, error) {
|
2017-03-25 13:28:38 -04:00
|
|
|
if len(layouts) == 0 && p.selfLayout != "" {
|
2017-03-26 13:34:30 -04:00
|
|
|
return []string{p.selfLayout}, nil
|
2017-03-19 10:25:32 -04:00
|
|
|
}
|
|
|
|
|
2018-01-13 11:21:42 -05:00
|
|
|
layoutDescriptor := p.layoutDescriptor
|
|
|
|
|
2017-03-19 10:25:32 -04:00
|
|
|
if len(layouts) > 0 {
|
2018-01-13 11:21:42 -05:00
|
|
|
layoutDescriptor.Layout = layouts[0]
|
|
|
|
layoutDescriptor.LayoutOverride = true
|
2017-03-19 10:25:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return p.s.layoutHandler.For(
|
2018-01-13 11:21:42 -05:00
|
|
|
layoutDescriptor,
|
2017-03-19 10:25:32 -04:00
|
|
|
p.outputFormat)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *PageOutput) Render(layout ...string) template.HTML {
|
2017-03-26 13:34:30 -04:00
|
|
|
l, err := p.layouts(layout...)
|
|
|
|
if err != nil {
|
|
|
|
helpers.DistinctErrorLog.Printf("in .Render: Failed to resolve layout %q for page %q", layout, p.pathOrTitle())
|
2017-03-27 14:43:49 -04:00
|
|
|
return ""
|
2017-03-26 13:34:30 -04:00
|
|
|
}
|
2017-03-27 14:43:49 -04:00
|
|
|
|
|
|
|
for _, layout := range l {
|
|
|
|
templ := p.s.Tmpl.Lookup(layout)
|
|
|
|
if templ == nil {
|
|
|
|
// This is legacy from when we had only one output format and
|
|
|
|
// HTML templates only. Some have references to layouts without suffix.
|
|
|
|
// We default to good old HTML.
|
|
|
|
templ = p.s.Tmpl.Lookup(layout + ".html")
|
|
|
|
}
|
|
|
|
if templ != nil {
|
|
|
|
res, err := templ.ExecuteToString(p)
|
|
|
|
if err != nil {
|
2018-02-13 03:01:47 -05:00
|
|
|
helpers.DistinctErrorLog.Printf("in .Render: Failed to execute template %q: %s", layout, err)
|
2017-03-27 14:43:49 -04:00
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
return template.HTML(res)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
2017-03-19 10:25:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Page) Render(layout ...string) template.HTML {
|
|
|
|
return p.mainPageOutput.Render(layout...)
|
|
|
|
}
|
2017-03-21 19:25:55 -04:00
|
|
|
|
|
|
|
// OutputFormats holds a list of the relevant output formats for a given resource.
|
|
|
|
type OutputFormats []*OutputFormat
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// OutputFormat links to a representation of a resource.
|
2017-03-21 19:25:55 -04:00
|
|
|
type OutputFormat struct {
|
2017-03-22 04:54:56 -04:00
|
|
|
// Rel constains a value that can be used to construct a rel link.
|
|
|
|
// This is value is fetched from the output format definition.
|
|
|
|
// Note that for pages with only one output format,
|
|
|
|
// this method will always return "canonical".
|
|
|
|
// As an example, the AMP output format will, by default, return "amphtml".
|
|
|
|
//
|
|
|
|
// See:
|
|
|
|
// https://www.ampproject.org/docs/guides/deploy/discovery
|
|
|
|
//
|
|
|
|
// Most other output formats will have "alternate" as value for this.
|
|
|
|
Rel string
|
|
|
|
|
|
|
|
// It may be tempting to export this, but let us hold on to that horse for a while.
|
2017-03-21 19:25:55 -04:00
|
|
|
f output.Format
|
2017-03-22 06:03:42 -04:00
|
|
|
|
2017-03-21 19:25:55 -04:00
|
|
|
p *Page
|
|
|
|
}
|
|
|
|
|
2017-03-22 04:54:56 -04:00
|
|
|
// Name returns this OutputFormat's name, i.e. HTML, AMP, JSON etc.
|
|
|
|
func (o OutputFormat) Name() string {
|
|
|
|
return o.f.Name
|
|
|
|
}
|
|
|
|
|
2017-03-22 06:03:42 -04:00
|
|
|
// MediaType returns this OutputFormat's MediaType (MIME type).
|
|
|
|
func (o OutputFormat) MediaType() media.Type {
|
|
|
|
return o.f.MediaType
|
|
|
|
}
|
|
|
|
|
2017-03-21 19:25:55 -04:00
|
|
|
// OutputFormats gives the output formats for this Page.
|
|
|
|
func (p *Page) OutputFormats() OutputFormats {
|
|
|
|
var o OutputFormats
|
|
|
|
for _, f := range p.outputFormats {
|
2017-03-24 06:25:25 -04:00
|
|
|
o = append(o, newOutputFormat(p, f))
|
2017-03-21 19:25:55 -04:00
|
|
|
}
|
|
|
|
return o
|
|
|
|
}
|
|
|
|
|
2017-03-24 06:25:25 -04:00
|
|
|
func newOutputFormat(p *Page, f output.Format) *OutputFormat {
|
|
|
|
rel := f.Rel
|
|
|
|
isCanonical := len(p.outputFormats) == 1
|
|
|
|
if isCanonical {
|
|
|
|
rel = "canonical"
|
|
|
|
}
|
|
|
|
return &OutputFormat{Rel: rel, f: f, p: p}
|
|
|
|
}
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// AlternativeOutputFormats gives the alternative output formats for this PageOutput.
|
2017-04-08 05:15:28 -04:00
|
|
|
// Note that we use the term "alternative" and not "alternate" here, as it
|
|
|
|
// does not necessarily replace the other format, it is an alternative representation.
|
2017-03-22 04:54:56 -04:00
|
|
|
func (p *PageOutput) AlternativeOutputFormats() (OutputFormats, error) {
|
|
|
|
var o OutputFormats
|
|
|
|
for _, of := range p.OutputFormats() {
|
2017-04-08 05:15:28 -04:00
|
|
|
if of.f.NotAlternative || of.f == p.outputFormat {
|
2017-03-22 04:54:56 -04:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
o = append(o, of)
|
|
|
|
}
|
|
|
|
return o, nil
|
|
|
|
}
|
|
|
|
|
: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
|
|
|
// deleteResource removes the resource from this PageOutput and the Page. They will
|
|
|
|
// always be of the same length, but may contain different elements.
|
|
|
|
func (p *PageOutput) deleteResource(i int) {
|
|
|
|
p.resources = append(p.resources[:i], p.resources[i+1:]...)
|
|
|
|
p.Page.Resources = append(p.Page.Resources[:i], p.Page.Resources[i+1:]...)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *PageOutput) Resources() resource.Resources {
|
|
|
|
p.resourcesInit.Do(func() {
|
|
|
|
// If the current out shares the same path as the main page output, we reuse
|
|
|
|
// the resource set. For the "amp" use case, we need to clone them with new
|
|
|
|
// base folder.
|
|
|
|
ff := p.outputFormats[0]
|
|
|
|
if p.outputFormat.Path == ff.Path {
|
|
|
|
p.resources = p.Page.Resources
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clone it with new base.
|
|
|
|
resources := make(resource.Resources, len(p.Page.Resources))
|
|
|
|
|
|
|
|
for i, r := range p.Page.Resources {
|
|
|
|
if c, ok := r.(resource.Cloner); ok {
|
|
|
|
// Clone the same resource with a new target.
|
|
|
|
resources[i] = c.WithNewBase(p.outputFormat.Path)
|
|
|
|
} else {
|
|
|
|
resources[i] = r
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
p.resources = resources
|
|
|
|
})
|
|
|
|
|
|
|
|
return p.resources
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *PageOutput) renderResources() error {
|
|
|
|
|
|
|
|
for i, r := range p.Resources() {
|
|
|
|
src, ok := r.(resource.Source)
|
|
|
|
if !ok {
|
|
|
|
// Pages gets rendered with the owning page.
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := src.Publish(); err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
// The resource has been deleted from the file system.
|
|
|
|
// This should be extremely rare, but can happen on live reload in server
|
|
|
|
// mode when the same resource is member of different page bundles.
|
|
|
|
p.deleteResource(i)
|
|
|
|
} else {
|
|
|
|
p.s.Log.ERROR.Printf("Failed to publish %q for page %q: %s", src.AbsSourceFilename(), p.pathOrTitle(), err)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
p.s.PathSpec.ProcessingStats.Incr(&p.s.PathSpec.ProcessingStats.Files)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-03-22 04:54:56 -04:00
|
|
|
// AlternativeOutputFormats is only available on the top level rendering
|
|
|
|
// entry point, and not inside range loops on the Page collections.
|
|
|
|
// This method is just here to inform users of that restriction.
|
|
|
|
func (p *Page) AlternativeOutputFormats() (OutputFormats, error) {
|
|
|
|
return nil, fmt.Errorf("AlternativeOutputFormats only available from the top level template context for page %q", p.Path())
|
|
|
|
}
|
|
|
|
|
2017-03-21 19:25:55 -04:00
|
|
|
// Get gets a OutputFormat given its name, i.e. json, html etc.
|
|
|
|
// It returns nil if not found.
|
|
|
|
func (o OutputFormats) Get(name string) *OutputFormat {
|
|
|
|
for _, f := range o {
|
2017-04-04 12:14:41 -04:00
|
|
|
if strings.EqualFold(f.f.Name, name) {
|
2017-03-21 19:25:55 -04:00
|
|
|
return f
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Permalink returns the absolute permalink to this output format.
|
|
|
|
func (o *OutputFormat) Permalink() string {
|
|
|
|
rel := o.p.createRelativePermalinkForOutputFormat(o.f)
|
2017-03-23 15:05:10 -04:00
|
|
|
perm, _ := o.p.s.permalinkForOutputFormat(rel, o.f)
|
|
|
|
return perm
|
2017-03-21 19:25:55 -04:00
|
|
|
}
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// RelPermalink returns the relative permalink to this output format.
|
2017-03-21 19:25:55 -04:00
|
|
|
func (o *OutputFormat) RelPermalink() string {
|
|
|
|
rel := o.p.createRelativePermalinkForOutputFormat(o.f)
|
|
|
|
return o.p.s.PathSpec.PrependBasePath(rel)
|
|
|
|
}
|