2017-03-09 18:19:29 +00: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 (
|
|
|
|
"fmt"
|
|
|
|
"path/filepath"
|
|
|
|
|
|
|
|
"net/url"
|
|
|
|
"strings"
|
|
|
|
|
2017-06-13 16:42:45 +00:00
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/gohugoio/hugo/output"
|
2017-03-09 18:19:29 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// targetPathDescriptor describes how a file path for a given resource
|
|
|
|
// should look like on the file system. The same descriptor is then later used to
|
|
|
|
// create both the permalinks and the relative links, paginator URLs etc.
|
|
|
|
//
|
|
|
|
// The big motivating behind this is to have only one source of truth for URLs,
|
|
|
|
// and by that also get rid of most of the fragile string parsing/encoding etc.
|
|
|
|
//
|
|
|
|
// Page.createTargetPathDescriptor is the Page adapter.
|
|
|
|
//
|
|
|
|
type targetPathDescriptor struct {
|
|
|
|
PathSpec *helpers.PathSpec
|
|
|
|
|
2017-03-16 07:32:14 +00:00
|
|
|
Type output.Format
|
2017-03-09 18:19:29 +00:00
|
|
|
Kind string
|
|
|
|
|
|
|
|
Sections []string
|
|
|
|
|
|
|
|
// For regular content pages this is either
|
|
|
|
// 1) the Slug, if set,
|
|
|
|
// 2) the file base name (TranslationBaseName).
|
|
|
|
BaseName string
|
|
|
|
|
|
|
|
// Source directory.
|
|
|
|
Dir string
|
|
|
|
|
|
|
|
// Language prefix, set if multilingual and if page should be placed in its
|
|
|
|
// language subdir.
|
|
|
|
LangPrefix string
|
|
|
|
|
2017-11-20 09:34:30 +00:00
|
|
|
// Whether this is a multihost multilingual setup.
|
|
|
|
IsMultihost bool
|
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
// URL from front matter if set. Will override any Slug etc.
|
2017-03-09 18:19:29 +00:00
|
|
|
URL string
|
|
|
|
|
|
|
|
// Used to create paginator links.
|
|
|
|
Addends string
|
|
|
|
|
|
|
|
// The expanded permalink if defined for the section, ready to use.
|
|
|
|
ExpandedPermalink string
|
|
|
|
|
|
|
|
// Some types cannot have uglyURLs, even if globally enabled, RSS being one example.
|
|
|
|
UglyURLs bool
|
|
|
|
}
|
|
|
|
|
2017-03-16 07:32:14 +00:00
|
|
|
// createTargetPathDescriptor adapts a Page and the given output.Format into
|
2017-03-09 18:19:29 +00:00
|
|
|
// a targetPathDescriptor. This descriptor can then be used to create paths
|
|
|
|
// and URLs for this Page.
|
2017-03-16 07:32:14 +00:00
|
|
|
func (p *Page) createTargetPathDescriptor(t output.Format) (targetPathDescriptor, error) {
|
2017-03-17 15:35:09 +00:00
|
|
|
if p.targetPathDescriptorPrototype == nil {
|
2018-01-15 19:40:39 +00:00
|
|
|
panic(fmt.Sprintf("Must run initTargetPathDescriptor() for page %q, kind %q", p.title, p.Kind))
|
2017-03-17 15:35:09 +00:00
|
|
|
}
|
|
|
|
d := *p.targetPathDescriptorPrototype
|
|
|
|
d.Type = t
|
|
|
|
return d, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Page) initTargetPathDescriptor() error {
|
|
|
|
d := &targetPathDescriptor{
|
2017-11-20 09:34:30 +00:00
|
|
|
PathSpec: p.s.PathSpec,
|
|
|
|
Kind: p.Kind,
|
|
|
|
Sections: p.sections,
|
2018-01-11 16:46:43 +00:00
|
|
|
UglyURLs: p.s.Info.uglyURLs(p),
|
2017-11-20 09:34:30 +00:00
|
|
|
Dir: filepath.ToSlash(p.Source.Dir()),
|
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 10:32:55 +00:00
|
|
|
URL: p.frontMatterURL,
|
2017-11-20 09:34:30 +00:00
|
|
|
IsMultihost: p.s.owner.IsMultihost(),
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if p.Slug != "" {
|
|
|
|
d.BaseName = p.Slug
|
|
|
|
} else {
|
|
|
|
d.BaseName = p.TranslationBaseName()
|
|
|
|
}
|
|
|
|
|
|
|
|
if p.shouldAddLanguagePrefix() {
|
|
|
|
d.LangPrefix = p.Lang()
|
|
|
|
}
|
|
|
|
|
2017-11-07 03:58:41 +00:00
|
|
|
// Expand only KindPage and KindTaxonomy; don't expand other Kinds of Pages
|
|
|
|
// like KindSection or KindTaxonomyTerm because they are "shallower" and
|
|
|
|
// the permalink configuration values are likely to be redundant, e.g.
|
|
|
|
// naively expanding /category/:slug/ would give /category/categories/ for
|
|
|
|
// the "categories" KindTaxonomyTerm.
|
|
|
|
if p.Kind == KindPage || p.Kind == KindTaxonomy {
|
|
|
|
if override, ok := p.Site.Permalinks[p.Section()]; ok {
|
|
|
|
opath, err := override.Expand(p)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2017-11-07 03:58:41 +00:00
|
|
|
opath, _ = url.QueryUnescape(opath)
|
|
|
|
opath = filepath.FromSlash(opath)
|
|
|
|
d.ExpandedPermalink = opath
|
|
|
|
}
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
|
|
|
|
2017-03-17 15:35:09 +00:00
|
|
|
p.targetPathDescriptorPrototype = d
|
|
|
|
return nil
|
2017-03-09 18:19:29 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
: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 07:00:23 +00:00
|
|
|
func (p *Page) initURLs() error {
|
|
|
|
if len(p.outputFormats) == 0 {
|
|
|
|
p.outputFormats = p.s.outputFormats[p.Kind]
|
|
|
|
}
|
2018-01-10 09:20:08 +00:00
|
|
|
target := filepath.ToSlash(p.createRelativeTargetPath())
|
|
|
|
rel := p.s.PathSpec.URLizeFilename(target)
|
: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 07:00:23 +00:00
|
|
|
|
|
|
|
var err error
|
|
|
|
f := p.outputFormats[0]
|
|
|
|
p.permalink, err = p.s.permalinkForOutputFormat(rel, f)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-01-05 10:07:50 +00:00
|
|
|
|
Add Hugo Piper with SCSS support and much more
Before this commit, you would have to use page bundles to do image processing etc. in Hugo.
This commit adds
* A new `/assets` top-level project or theme dir (configurable via `assetDir`)
* A new template func, `resources.Get` which can be used to "get a resource" that can be further processed.
This means that you can now do this in your templates (or shortcodes):
```bash
{{ $sunset := (resources.Get "images/sunset.jpg").Fill "300x200" }}
```
This also adds a new `extended` build tag that enables powerful SCSS/SASS support with source maps. To compile this from source, you will also need a C compiler installed:
```
HUGO_BUILD_TAGS=extended mage install
```
Note that you can use output of the SCSS processing later in a non-SCSSS-enabled Hugo.
The `SCSS` processor is a _Resource transformation step_ and it can be chained with the many others in a pipeline:
```bash
{{ $css := resources.Get "styles.scss" | resources.ToCSS | resources.PostCSS | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
The transformation funcs above have aliases, so it can be shortened to:
```bash
{{ $css := resources.Get "styles.scss" | toCSS | postCSS | minify | fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
A quick tip would be to avoid the fingerprinting part, and possibly also the not-superfast `postCSS` when you're doing development, as it allows Hugo to be smarter about the rebuilding.
Documentation will follow, but have a look at the demo repo in https://github.com/bep/hugo-sass-test
New functions to create `Resource` objects:
* `resources.Get` (see above)
* `resources.FromString`: Create a Resource from a string.
New `Resource` transformation funcs:
* `resources.ToCSS`: Compile `SCSS` or `SASS` into `CSS`.
* `resources.PostCSS`: Process your CSS with PostCSS. Config file support (project or theme or passed as an option).
* `resources.Minify`: Currently supports `css`, `js`, `json`, `html`, `svg`, `xml`.
* `resources.Fingerprint`: Creates a fingerprinted version of the given Resource with Subresource Integrity..
* `resources.Concat`: Concatenates a list of Resource objects. Think of this as a poor man's bundler.
* `resources.ExecuteAsTemplate`: Parses and executes the given Resource and data context (e.g. .Site) as a Go template.
Fixes #4381
Fixes #4903
Fixes #4858
2018-02-20 09:02:14 +00:00
|
|
|
p.relTargetPathBase = strings.TrimPrefix(strings.TrimSuffix(target, f.MediaType.FullSuffix()), "/")
|
|
|
|
if prefix := p.s.GetLanguagePrefix(); prefix != "" {
|
|
|
|
// Any language code in the path will be added later.
|
|
|
|
p.relTargetPathBase = strings.TrimPrefix(p.relTargetPathBase, prefix+"/")
|
|
|
|
}
|
2018-01-05 10:07:50 +00:00
|
|
|
p.relPermalink = p.s.PathSpec.PrependBasePath(rel)
|
: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 07:00:23 +00:00
|
|
|
p.layoutDescriptor = p.createLayoutDescriptor()
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Page) initPaths() error {
|
|
|
|
if err := p.initTargetPathDescriptor(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := p.initURLs(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-03-09 18:19:29 +00:00
|
|
|
// createTargetPath creates the target filename for this Page for the given
|
2017-03-16 07:32:14 +00:00
|
|
|
// output.Format. Some additional URL parts can also be provided, the typical
|
2017-03-09 18:19:29 +00:00
|
|
|
// use case being pagination.
|
2017-11-12 09:03:56 +00:00
|
|
|
func (p *Page) createTargetPath(t output.Format, noLangPrefix bool, addends ...string) (string, error) {
|
2017-03-09 18:19:29 +00:00
|
|
|
d, err := p.createTargetPathDescriptor(t)
|
|
|
|
if err != nil {
|
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
|
2017-11-12 09:03:56 +00:00
|
|
|
if noLangPrefix {
|
|
|
|
d.LangPrefix = ""
|
|
|
|
}
|
|
|
|
|
2017-03-09 18:19:29 +00:00
|
|
|
if len(addends) > 0 {
|
|
|
|
d.Addends = filepath.Join(addends...)
|
|
|
|
}
|
|
|
|
|
|
|
|
return createTargetPath(d), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func createTargetPath(d targetPathDescriptor) string {
|
|
|
|
|
|
|
|
pagePath := helpers.FilePathSeparator
|
|
|
|
|
|
|
|
// The top level index files, i.e. the home page etc., needs
|
|
|
|
// the index base even when uglyURLs is enabled.
|
|
|
|
needsBase := true
|
|
|
|
|
|
|
|
isUgly := d.UglyURLs && !d.Type.NoUgly
|
|
|
|
|
: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 07:00:23 +00:00
|
|
|
if d.ExpandedPermalink == "" && d.BaseName != "" && d.BaseName == d.Type.BaseName {
|
2017-04-27 07:33:40 +00:00
|
|
|
isUgly = true
|
|
|
|
}
|
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
if d.Kind != KindPage && d.URL == "" && len(d.Sections) > 0 {
|
2017-11-07 03:58:41 +00:00
|
|
|
if d.ExpandedPermalink != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.ExpandedPermalink)
|
|
|
|
} else {
|
2018-08-22 05:18:37 +00:00
|
|
|
pagePath = ""
|
|
|
|
for i, section := range d.Sections {
|
|
|
|
if i > 0 {
|
|
|
|
pagePath += helpers.FilePathSeparator
|
|
|
|
}
|
|
|
|
pagePath += d.PathSpec.MakeSegment(section)
|
|
|
|
}
|
2017-11-07 03:58:41 +00:00
|
|
|
}
|
2017-03-09 18:19:29 +00:00
|
|
|
needsBase = false
|
|
|
|
}
|
|
|
|
|
|
|
|
if d.Type.Path != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Type.Path)
|
|
|
|
}
|
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
if d.Kind != KindHome && d.URL != "" {
|
|
|
|
if d.IsMultihost && d.LangPrefix != "" && !strings.HasPrefix(d.URL, "/"+d.LangPrefix) {
|
|
|
|
pagePath = filepath.Join(d.LangPrefix, pagePath, d.URL)
|
2017-03-09 18:19:29 +00:00
|
|
|
} else {
|
2018-01-12 16:17:10 +00:00
|
|
|
pagePath = filepath.Join(pagePath, d.URL)
|
|
|
|
}
|
2018-02-26 16:45:51 +00:00
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
if d.Addends != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Addends)
|
2018-02-26 16:45:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if strings.HasSuffix(d.URL, "/") || !strings.Contains(d.URL, ".") {
|
2018-01-12 16:17:10 +00:00
|
|
|
pagePath = filepath.Join(pagePath, d.Type.BaseName+d.Type.MediaType.FullSuffix())
|
|
|
|
}
|
2018-02-26 16:45:51 +00:00
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
} else if d.Kind == KindPage {
|
|
|
|
if d.ExpandedPermalink != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.ExpandedPermalink)
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
} else {
|
|
|
|
if d.Dir != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Dir)
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
2018-01-12 16:17:10 +00:00
|
|
|
if d.BaseName != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.BaseName)
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
2018-01-12 16:17:10 +00:00
|
|
|
}
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2018-01-12 16:17:10 +00:00
|
|
|
if d.Addends != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Addends)
|
|
|
|
}
|
|
|
|
|
|
|
|
if isUgly {
|
2018-07-10 09:55:22 +00:00
|
|
|
pagePath += d.Type.MediaType.FullSuffix()
|
2018-01-12 16:17:10 +00:00
|
|
|
} else {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Type.BaseName+d.Type.MediaType.FullSuffix())
|
|
|
|
}
|
|
|
|
|
|
|
|
if d.LangPrefix != "" {
|
|
|
|
pagePath = filepath.Join(d.LangPrefix, pagePath)
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if d.Addends != "" {
|
|
|
|
pagePath = filepath.Join(pagePath, d.Addends)
|
|
|
|
}
|
|
|
|
|
|
|
|
needsBase = needsBase && d.Addends == ""
|
|
|
|
|
|
|
|
// No permalink expansion etc. for node type pages (for now)
|
|
|
|
base := ""
|
|
|
|
|
|
|
|
if needsBase || !isUgly {
|
|
|
|
base = helpers.FilePathSeparator + d.Type.BaseName
|
|
|
|
}
|
|
|
|
|
2017-06-20 06:45:52 +00:00
|
|
|
pagePath += base + d.Type.MediaType.FullSuffix()
|
2017-03-09 18:19:29 +00:00
|
|
|
|
|
|
|
if d.LangPrefix != "" {
|
|
|
|
pagePath = filepath.Join(d.LangPrefix, pagePath)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pagePath = filepath.Join(helpers.FilePathSeparator, pagePath)
|
|
|
|
|
|
|
|
// Note: MakePathSanitized will lower case the path if
|
|
|
|
// disablePathToLower isn't set.
|
|
|
|
return d.PathSpec.MakePathSanitized(pagePath)
|
|
|
|
}
|
|
|
|
|
2018-01-10 09:20:08 +00:00
|
|
|
func (p *Page) createRelativeTargetPath() string {
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2017-03-16 07:32:14 +00:00
|
|
|
if len(p.outputFormats) == 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 07:00:23 +00:00
|
|
|
if p.Kind == kindUnknown {
|
2018-01-15 19:40:39 +00:00
|
|
|
panic(fmt.Sprintf("Page %q has unknown kind", p.title))
|
: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 07:00:23 +00:00
|
|
|
}
|
2018-01-15 19:40:39 +00:00
|
|
|
panic(fmt.Sprintf("Page %q missing output format(s)", p.title))
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Choose the main output format. In most cases, this will be HTML.
|
2017-03-21 23:25:55 +00:00
|
|
|
f := p.outputFormats[0]
|
|
|
|
|
2018-01-10 09:20:08 +00:00
|
|
|
return p.createRelativeTargetPathForOutputFormat(f)
|
2017-03-21 23:25:55 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Page) createRelativePermalinkForOutputFormat(f output.Format) string {
|
2018-01-10 09:20:08 +00:00
|
|
|
return p.s.PathSpec.URLizeFilename(p.createRelativeTargetPathForOutputFormat(f))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Page) createRelativeTargetPathForOutputFormat(f output.Format) string {
|
2017-11-12 09:03:56 +00:00
|
|
|
tp, err := p.createTargetPath(f, p.s.owner.IsMultihost())
|
2017-03-09 18:19:29 +00:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
p.s.Log.ERROR.Printf("Failed to create permalink for page %q: %s", p.FullFilePath(), err)
|
|
|
|
return ""
|
|
|
|
}
|
: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 07:00:23 +00:00
|
|
|
|
2017-03-21 23:25:55 +00:00
|
|
|
// For /index.json etc. we must use the full path.
|
|
|
|
if strings.HasSuffix(f.BaseFilename(), "html") {
|
|
|
|
tp = strings.TrimSuffix(tp, f.BaseFilename())
|
|
|
|
}
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2018-01-10 09:20:08 +00:00
|
|
|
return tp
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|