2016-10-24 07:45:30 -04:00
|
|
|
// Copyright 2016-present 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 helpers
|
|
|
|
|
2017-01-10 04:55:03 -05:00
|
|
|
import (
|
|
|
|
"fmt"
|
: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
|
|
|
"strings"
|
2017-01-10 04:55:03 -05:00
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
"github.com/spf13/afero"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/common/types"
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/config"
|
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
2017-11-19 09:44:20 -05:00
|
|
|
"github.com/spf13/cast"
|
2017-01-10 04:55:03 -05:00
|
|
|
)
|
|
|
|
|
2016-10-24 07:45:30 -04:00
|
|
|
// PathSpec holds methods that decides how paths in URLs and files in Hugo should look like.
|
|
|
|
type PathSpec struct {
|
2017-03-09 13:19:29 -05:00
|
|
|
BaseURL
|
|
|
|
|
2018-01-05 05:07:50 -05:00
|
|
|
// If the baseURL contains a base path, e.g. https://example.com/docs, then "/docs" will be the BasePath.
|
|
|
|
// This will not be set if canonifyURLs is enabled.
|
|
|
|
BasePath string
|
|
|
|
|
2016-10-24 07:45:30 -04:00
|
|
|
disablePathToLower bool
|
|
|
|
removePathAccents bool
|
|
|
|
uglyURLs bool
|
|
|
|
canonifyURLs bool
|
|
|
|
|
2018-01-05 06:01:13 -05:00
|
|
|
Language *Language
|
|
|
|
Languages Languages
|
2016-10-24 07:45:30 -04:00
|
|
|
|
|
|
|
// pagination path handling
|
|
|
|
paginatePath string
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
theme string
|
2017-02-04 22:20:06 -05:00
|
|
|
|
|
|
|
// Directories
|
2018-03-21 12:21:46 -04:00
|
|
|
contentDir string
|
|
|
|
themesDir string
|
|
|
|
layoutDir string
|
|
|
|
workingDir string
|
|
|
|
staticDirs []string
|
|
|
|
absContentDirs []types.KeyValueStr
|
|
|
|
|
: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
|
|
|
PublishDir string
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2016-10-24 07:45:30 -04:00
|
|
|
// The PathSpec looks up its config settings in both the current language
|
|
|
|
// and then in the global Viper config.
|
|
|
|
// Some settings, the settings listed below, does not make sense to be set
|
|
|
|
// on per-language-basis. We have no good way of protecting against this
|
|
|
|
// other than a "white-list". See language.go.
|
|
|
|
defaultContentLanguageInSubdir bool
|
|
|
|
defaultContentLanguage string
|
|
|
|
multilingual bool
|
2017-01-10 04:55:03 -05: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 03:00:23 -04:00
|
|
|
ProcessingStats *ProcessingStats
|
|
|
|
|
2017-01-10 04:55:03 -05:00
|
|
|
// The file systems to use
|
2017-06-18 13:39:42 -04:00
|
|
|
Fs *hugofs.Fs
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
// The fine grained filesystems in play (resources, content etc.).
|
|
|
|
BaseFs *hugofs.BaseFs
|
|
|
|
|
2017-06-18 13:39:42 -04:00
|
|
|
// The config provider to use
|
|
|
|
Cfg config.Provider
|
2017-01-10 04:55:03 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
func (p PathSpec) String() string {
|
2018-01-05 06:01:13 -05:00
|
|
|
return fmt.Sprintf("PathSpec, language %q, prefix %q, multilingual: %T", p.Language.Lang, p.getLanguagePrefix(), p.multilingual)
|
2016-10-24 07:45:30 -04:00
|
|
|
}
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
// NewPathSpec creats a new PathSpec from the given filesystems and Language.
|
2017-03-25 09:37:04 -04:00
|
|
|
func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) {
|
2017-01-10 04:55:03 -05:00
|
|
|
|
2017-03-25 09:37:04 -04:00
|
|
|
baseURLstr := cfg.GetString("baseURL")
|
|
|
|
baseURL, err := newBaseURLFromString(baseURLstr)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Failed to create baseURL from %q: %s", baseURLstr, err)
|
|
|
|
}
|
2017-03-09 13:19:29 -05:00
|
|
|
|
2017-11-12 04:03:56 -05:00
|
|
|
var staticDirs []string
|
|
|
|
|
|
|
|
for i := -1; i <= 10; i++ {
|
|
|
|
staticDirs = append(staticDirs, getStringOrStringSlice(cfg, "staticDir", i)...)
|
|
|
|
}
|
|
|
|
|
2017-12-29 03:37:37 -05:00
|
|
|
var (
|
|
|
|
lang string
|
|
|
|
language *Language
|
|
|
|
languages Languages
|
|
|
|
)
|
|
|
|
|
: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 l, ok := cfg.(*Language); ok {
|
2017-12-29 03:37:37 -05:00
|
|
|
language = l
|
: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
|
|
|
lang = l.Lang
|
2017-12-29 03:37:37 -05:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if l, ok := cfg.Get("languagesSorted").(Languages); ok {
|
|
|
|
languages = l
|
: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
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
defaultContentLanguage := cfg.GetString("defaultContentLanguage")
|
|
|
|
|
|
|
|
// We will eventually pull out this badly placed path logic.
|
|
|
|
contentDir := cfg.GetString("contentDir")
|
|
|
|
workingDir := cfg.GetString("workingDir")
|
|
|
|
resourceDir := cfg.GetString("resourceDir")
|
|
|
|
publishDir := cfg.GetString("publishDir")
|
|
|
|
|
|
|
|
if len(languages) == 0 {
|
|
|
|
// We have some old tests that does not test the entire chain, hence
|
|
|
|
// they have no languages. So create one so we get the proper filesystem.
|
|
|
|
languages = Languages{&Language{Lang: "en", ContentDir: contentDir}}
|
|
|
|
}
|
|
|
|
|
|
|
|
absPuslishDir := AbsPathify(workingDir, publishDir)
|
|
|
|
if !strings.HasSuffix(absPuslishDir, FilePathSeparator) {
|
|
|
|
absPuslishDir += FilePathSeparator
|
|
|
|
}
|
|
|
|
// If root, remove the second '/'
|
|
|
|
if absPuslishDir == "//" {
|
|
|
|
absPuslishDir = FilePathSeparator
|
|
|
|
}
|
|
|
|
absResourcesDir := AbsPathify(workingDir, resourceDir)
|
|
|
|
if !strings.HasSuffix(absResourcesDir, FilePathSeparator) {
|
|
|
|
absResourcesDir += FilePathSeparator
|
|
|
|
}
|
|
|
|
if absResourcesDir == "//" {
|
|
|
|
absResourcesDir = FilePathSeparator
|
|
|
|
}
|
|
|
|
|
|
|
|
contentFs, absContentDirs, err := createContentFs(fs.Source, workingDir, defaultContentLanguage, languages)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure we don't have any overlapping content dirs. That will never work.
|
|
|
|
for i, d1 := range absContentDirs {
|
|
|
|
for j, d2 := range absContentDirs {
|
|
|
|
if i == j {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if strings.HasPrefix(d1.Value, d2.Value) || strings.HasPrefix(d2.Value, d1.Value) {
|
|
|
|
return nil, fmt.Errorf("found overlapping content dirs (%q and %q)", d1, d2)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resourcesFs := afero.NewBasePathFs(fs.Source, absResourcesDir)
|
|
|
|
publishFs := afero.NewBasePathFs(fs.Destination, absPuslishDir)
|
|
|
|
|
|
|
|
baseFs := &hugofs.BaseFs{
|
|
|
|
ContentFs: contentFs,
|
|
|
|
ResourcesFs: resourcesFs,
|
|
|
|
PublishFs: publishFs,
|
|
|
|
}
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
ps := &PathSpec{
|
2017-06-18 13:39:42 -04:00
|
|
|
Fs: fs,
|
2018-03-21 12:21:46 -04:00
|
|
|
BaseFs: baseFs,
|
2017-06-18 13:39:42 -04:00
|
|
|
Cfg: cfg,
|
2017-02-04 22:20:06 -05:00
|
|
|
disablePathToLower: cfg.GetBool("disablePathToLower"),
|
|
|
|
removePathAccents: cfg.GetBool("removePathAccents"),
|
|
|
|
uglyURLs: cfg.GetBool("uglyURLs"),
|
|
|
|
canonifyURLs: cfg.GetBool("canonifyURLs"),
|
|
|
|
multilingual: cfg.GetBool("multilingual"),
|
2018-01-05 06:01:13 -05:00
|
|
|
Language: language,
|
|
|
|
Languages: languages,
|
2017-02-04 22:20:06 -05:00
|
|
|
defaultContentLanguageInSubdir: cfg.GetBool("defaultContentLanguageInSubdir"),
|
2018-03-21 12:21:46 -04:00
|
|
|
defaultContentLanguage: defaultContentLanguage,
|
2017-02-04 22:20:06 -05:00
|
|
|
paginatePath: cfg.GetString("paginatePath"),
|
2017-03-09 13:19:29 -05:00
|
|
|
BaseURL: baseURL,
|
2018-03-21 12:21:46 -04:00
|
|
|
contentDir: contentDir,
|
2017-02-04 22:20:06 -05:00
|
|
|
themesDir: cfg.GetString("themesDir"),
|
|
|
|
layoutDir: cfg.GetString("layoutDir"),
|
2018-03-21 12:21:46 -04:00
|
|
|
workingDir: workingDir,
|
2017-11-12 04:03:56 -05:00
|
|
|
staticDirs: staticDirs,
|
2018-03-21 12:21:46 -04:00
|
|
|
absContentDirs: absContentDirs,
|
2017-02-04 22:20:06 -05:00
|
|
|
theme: cfg.GetString("theme"),
|
: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
|
|
|
ProcessingStats: NewProcessingStats(lang),
|
2017-01-10 04:55:03 -05:00
|
|
|
}
|
|
|
|
|
2018-01-05 05:07:50 -05:00
|
|
|
if !ps.canonifyURLs {
|
|
|
|
basePath := ps.BaseURL.url.Path
|
|
|
|
if basePath != "" && basePath != "/" {
|
|
|
|
ps.BasePath = basePath
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
// TODO(bep) remove this, eventually
|
|
|
|
ps.PublishDir = absPuslishDir
|
: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
|
|
|
|
2017-03-25 09:37:04 -04:00
|
|
|
return ps, nil
|
2016-10-24 07:45:30 -04:00
|
|
|
}
|
|
|
|
|
2017-11-12 04:03:56 -05:00
|
|
|
func getStringOrStringSlice(cfg config.Provider, key string, id int) []string {
|
|
|
|
|
2017-11-19 09:44:20 -05:00
|
|
|
if id >= 0 {
|
2017-11-12 04:03:56 -05:00
|
|
|
key = fmt.Sprintf("%s%d", key, id)
|
|
|
|
}
|
|
|
|
|
|
|
|
var out []string
|
|
|
|
|
|
|
|
sd := cfg.Get(key)
|
|
|
|
|
|
|
|
if sds, ok := sd.(string); ok {
|
|
|
|
out = []string{sds}
|
2017-11-19 09:44:20 -05:00
|
|
|
} else if sd != nil {
|
|
|
|
out = cast.ToStringSlice(sd)
|
2017-11-12 04:03:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return out
|
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
func createContentFs(fs afero.Fs,
|
|
|
|
workingDir,
|
|
|
|
defaultContentLanguage string,
|
|
|
|
languages Languages) (afero.Fs, []types.KeyValueStr, error) {
|
|
|
|
|
|
|
|
var contentLanguages Languages
|
|
|
|
var contentDirSeen = make(map[string]bool)
|
|
|
|
languageSet := make(map[string]bool)
|
|
|
|
|
|
|
|
// The default content language needs to be first.
|
|
|
|
for _, language := range languages {
|
|
|
|
if language.Lang == defaultContentLanguage {
|
|
|
|
contentLanguages = append(contentLanguages, language)
|
|
|
|
contentDirSeen[language.ContentDir] = true
|
|
|
|
}
|
|
|
|
languageSet[language.Lang] = true
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, language := range languages {
|
|
|
|
if contentDirSeen[language.ContentDir] {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if language.ContentDir == "" {
|
|
|
|
language.ContentDir = defaultContentLanguage
|
|
|
|
}
|
|
|
|
contentDirSeen[language.ContentDir] = true
|
|
|
|
contentLanguages = append(contentLanguages, language)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
var absContentDirs []types.KeyValueStr
|
|
|
|
|
|
|
|
fs, err := createContentOverlayFs(fs, workingDir, contentLanguages, languageSet, &absContentDirs)
|
|
|
|
return fs, absContentDirs, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func createContentOverlayFs(source afero.Fs,
|
|
|
|
workingDir string,
|
|
|
|
languages Languages,
|
|
|
|
languageSet map[string]bool,
|
|
|
|
absContentDirs *[]types.KeyValueStr) (afero.Fs, error) {
|
|
|
|
if len(languages) == 0 {
|
|
|
|
return source, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
language := languages[0]
|
|
|
|
|
|
|
|
contentDir := language.ContentDir
|
|
|
|
if contentDir == "" {
|
|
|
|
panic("missing contentDir")
|
|
|
|
}
|
|
|
|
|
|
|
|
absContentDir := AbsPathify(workingDir, language.ContentDir)
|
|
|
|
if !strings.HasSuffix(absContentDir, FilePathSeparator) {
|
|
|
|
absContentDir += FilePathSeparator
|
|
|
|
}
|
|
|
|
|
|
|
|
// If root, remove the second '/'
|
|
|
|
if absContentDir == "//" {
|
|
|
|
absContentDir = FilePathSeparator
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(absContentDir) < 6 {
|
|
|
|
return nil, fmt.Errorf("invalid content dir %q: %s", absContentDir, ErrPathTooShort)
|
|
|
|
}
|
|
|
|
|
|
|
|
*absContentDirs = append(*absContentDirs, types.KeyValueStr{Key: language.Lang, Value: absContentDir})
|
|
|
|
|
|
|
|
overlay := hugofs.NewLanguageFs(language.Lang, languageSet, afero.NewBasePathFs(source, absContentDir))
|
|
|
|
if len(languages) == 1 {
|
|
|
|
return overlay, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
base, err := createContentOverlayFs(source, workingDir, languages[1:], languageSet, absContentDirs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return hugofs.NewLanguageCompositeFs(base, overlay), nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// RelContentDir tries to create a path relative to the content root from
|
|
|
|
// the given filename. The return value is the path and language code.
|
|
|
|
func (p *PathSpec) RelContentDir(filename string) (string, string) {
|
|
|
|
for _, dir := range p.absContentDirs {
|
|
|
|
if strings.HasPrefix(filename, dir.Value) {
|
|
|
|
rel := strings.TrimPrefix(filename, dir.Value)
|
|
|
|
return strings.TrimPrefix(rel, FilePathSeparator), dir.Key
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Either not a content dir or already relative.
|
|
|
|
return filename, ""
|
|
|
|
}
|
|
|
|
|
|
|
|
// ContentDirs returns all the content dirs (absolute paths).
|
|
|
|
func (p *PathSpec) ContentDirs() []types.KeyValueStr {
|
|
|
|
return p.absContentDirs
|
|
|
|
}
|
|
|
|
|
2016-11-05 12:05:33 -04:00
|
|
|
// PaginatePath returns the configured root path used for paginator pages.
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) PaginatePath() string {
|
|
|
|
return p.paginatePath
|
|
|
|
}
|
2017-03-19 16:09:31 -04: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 03:00:23 -04:00
|
|
|
// ContentDir returns the configured workingDir.
|
|
|
|
func (p *PathSpec) ContentDir() string {
|
|
|
|
return p.contentDir
|
|
|
|
}
|
|
|
|
|
2017-03-19 16:09:31 -04:00
|
|
|
// WorkingDir returns the configured workingDir.
|
|
|
|
func (p *PathSpec) WorkingDir() string {
|
|
|
|
return p.workingDir
|
|
|
|
}
|
|
|
|
|
2017-11-12 04:03:56 -05:00
|
|
|
// StaticDirs returns the relative static dirs for the current configuration.
|
|
|
|
func (p *PathSpec) StaticDirs() []string {
|
|
|
|
return p.staticDirs
|
|
|
|
}
|
|
|
|
|
|
|
|
// LayoutDir returns the relative layout dir in the current configuration.
|
2017-03-19 16:09:31 -04:00
|
|
|
func (p *PathSpec) LayoutDir() string {
|
|
|
|
return p.layoutDir
|
|
|
|
}
|
|
|
|
|
|
|
|
// Theme returns the theme name if set.
|
|
|
|
func (p *PathSpec) Theme() string {
|
|
|
|
return p.theme
|
|
|
|
}
|
2017-11-12 04:03:56 -05:00
|
|
|
|
|
|
|
// Theme returns the theme relative theme dir.
|
|
|
|
func (p *PathSpec) ThemesDir() string {
|
|
|
|
return p.themesDir
|
|
|
|
}
|
: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
|
|
|
|
|
|
|
// PermalinkForBaseURL creates a permalink from the given link and baseURL.
|
|
|
|
func (p *PathSpec) PermalinkForBaseURL(link, baseURL string) string {
|
|
|
|
link = strings.TrimPrefix(link, "/")
|
|
|
|
if !strings.HasSuffix(baseURL, "/") {
|
|
|
|
baseURL += "/"
|
|
|
|
}
|
|
|
|
return baseURL + link
|
|
|
|
|
|
|
|
}
|