mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 09:32:09 -05:00
3cdf19e9b7
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
194 lines
6.8 KiB
Go
194 lines
6.8 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package hugolib
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/media"
|
|
|
|
"fmt"
|
|
|
|
"github.com/gohugoio/hugo/output"
|
|
)
|
|
|
|
func TestPageTargetPath(t *testing.T) {
|
|
|
|
pathSpec := newTestDefaultPathSpec()
|
|
|
|
noExtNoDelimMediaType := media.TextType
|
|
noExtNoDelimMediaType.Suffix = ""
|
|
noExtNoDelimMediaType.Delimiter = ""
|
|
|
|
// Netlify style _redirects
|
|
noExtDelimFormat := output.Format{
|
|
Name: "NER",
|
|
MediaType: noExtNoDelimMediaType,
|
|
BaseName: "_redirects",
|
|
}
|
|
|
|
for _, multiHost := range []bool{false, true} {
|
|
for _, langPrefix := range []string{"", "no"} {
|
|
for _, uglyURLs := range []bool{false, true} {
|
|
t.Run(fmt.Sprintf("multihost=%t,langPrefix=%q,uglyURLs=%t", multiHost, langPrefix, uglyURLs),
|
|
func(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
name string
|
|
d targetPathDescriptor
|
|
expected string
|
|
}{
|
|
{"JSON home", targetPathDescriptor{Kind: KindHome, Type: output.JSONFormat}, "/index.json"},
|
|
{"AMP home", targetPathDescriptor{Kind: KindHome, Type: output.AMPFormat}, "/amp/index.html"},
|
|
{"HTML home", targetPathDescriptor{Kind: KindHome, BaseName: "_index", Type: output.HTMLFormat}, "/index.html"},
|
|
{"Netlify redirects", targetPathDescriptor{Kind: KindHome, BaseName: "_index", Type: noExtDelimFormat}, "/_redirects"},
|
|
{"HTML section list", targetPathDescriptor{
|
|
Kind: KindSection,
|
|
Sections: []string{"sect1"},
|
|
BaseName: "_index",
|
|
Type: output.HTMLFormat}, "/sect1/index.html"},
|
|
{"HTML taxonomy list", targetPathDescriptor{
|
|
Kind: KindTaxonomy,
|
|
Sections: []string{"tags", "hugo"},
|
|
BaseName: "_index",
|
|
Type: output.HTMLFormat}, "/tags/hugo/index.html"},
|
|
{"HTML taxonomy term", targetPathDescriptor{
|
|
Kind: KindTaxonomy,
|
|
Sections: []string{"tags"},
|
|
BaseName: "_index",
|
|
Type: output.HTMLFormat}, "/tags/index.html"},
|
|
{
|
|
"HTML page", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b",
|
|
BaseName: "mypage",
|
|
Sections: []string{"a"},
|
|
Type: output.HTMLFormat}, "/a/b/mypage/index.html"},
|
|
|
|
{
|
|
"HTML page with index as base", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b",
|
|
BaseName: "index",
|
|
Sections: []string{"a"},
|
|
Type: output.HTMLFormat}, "/a/b/index.html"},
|
|
|
|
{
|
|
"HTML page with special chars", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b",
|
|
BaseName: "My Page!",
|
|
Type: output.HTMLFormat}, "/a/b/My-Page/index.html"},
|
|
{"RSS home", targetPathDescriptor{Kind: kindRSS, Type: output.RSSFormat}, "/index.xml"},
|
|
{"RSS section list", targetPathDescriptor{
|
|
Kind: kindRSS,
|
|
Sections: []string{"sect1"},
|
|
Type: output.RSSFormat}, "/sect1/index.xml"},
|
|
{
|
|
"AMP page", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b/c",
|
|
BaseName: "myamp",
|
|
Type: output.AMPFormat}, "/amp/a/b/c/myamp/index.html"},
|
|
{
|
|
"AMP page with URL with suffix", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/sect/",
|
|
BaseName: "mypage",
|
|
URL: "/some/other/url.xhtml",
|
|
Type: output.HTMLFormat}, "/some/other/url.xhtml"},
|
|
{
|
|
"JSON page with URL without suffix", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/sect/",
|
|
BaseName: "mypage",
|
|
URL: "/some/other/path/",
|
|
Type: output.JSONFormat}, "/some/other/path/index.json"},
|
|
{
|
|
"JSON page with URL without suffix and no trailing slash", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/sect/",
|
|
BaseName: "mypage",
|
|
URL: "/some/other/path",
|
|
Type: output.JSONFormat}, "/some/other/path/index.json"},
|
|
{
|
|
"HTML page with expanded permalink", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b",
|
|
BaseName: "mypage",
|
|
ExpandedPermalink: "/2017/10/my-title",
|
|
Type: output.HTMLFormat}, "/2017/10/my-title/index.html"},
|
|
{
|
|
"Paginated HTML home", targetPathDescriptor{
|
|
Kind: KindHome,
|
|
BaseName: "_index",
|
|
Type: output.HTMLFormat,
|
|
Addends: "page/3"}, "/page/3/index.html"},
|
|
{
|
|
"Paginated Taxonomy list", targetPathDescriptor{
|
|
Kind: KindTaxonomy,
|
|
BaseName: "_index",
|
|
Sections: []string{"tags", "hugo"},
|
|
Type: output.HTMLFormat,
|
|
Addends: "page/3"}, "/tags/hugo/page/3/index.html"},
|
|
{
|
|
"Regular page with addend", targetPathDescriptor{
|
|
Kind: KindPage,
|
|
Dir: "/a/b",
|
|
BaseName: "mypage",
|
|
Addends: "c/d/e",
|
|
Type: output.HTMLFormat}, "/a/b/mypage/c/d/e/index.html"},
|
|
}
|
|
|
|
for i, test := range tests {
|
|
test.d.PathSpec = pathSpec
|
|
test.d.UglyURLs = uglyURLs
|
|
test.d.LangPrefix = langPrefix
|
|
test.d.IsMultihost = multiHost
|
|
test.d.Dir = filepath.FromSlash(test.d.Dir)
|
|
isUgly := uglyURLs && !test.d.Type.NoUgly
|
|
|
|
expected := test.expected
|
|
|
|
// TODO(bep) simplify
|
|
if test.d.Kind == KindPage && test.d.BaseName == test.d.Type.BaseName {
|
|
|
|
} else if test.d.Kind == KindHome && test.d.Type.Path != "" {
|
|
} else if (!strings.HasPrefix(expected, "/index") || test.d.Addends != "") && test.d.URL == "" && isUgly {
|
|
expected = strings.Replace(expected,
|
|
"/"+test.d.Type.BaseName+"."+test.d.Type.MediaType.Suffix,
|
|
"."+test.d.Type.MediaType.Suffix, -1)
|
|
}
|
|
|
|
if test.d.LangPrefix != "" && !(test.d.Kind == KindPage && test.d.URL != "") {
|
|
expected = "/" + test.d.LangPrefix + expected
|
|
} else if multiHost && test.d.LangPrefix != "" && test.d.URL != "" {
|
|
expected = "/" + test.d.LangPrefix + expected
|
|
}
|
|
|
|
expected = filepath.FromSlash(expected)
|
|
|
|
pagePath := createTargetPath(test.d)
|
|
|
|
if pagePath != expected {
|
|
t.Fatalf("[%d] [%s] targetPath expected %q, got: %q", i, test.name, expected, pagePath)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|