mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -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
191 lines
5.2 KiB
Go
191 lines
5.2 KiB
Go
// 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
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
"github.com/spf13/cast"
|
|
)
|
|
|
|
// PathSpec holds methods that decides how paths in URLs and files in Hugo should look like.
|
|
type PathSpec struct {
|
|
BaseURL
|
|
|
|
disablePathToLower bool
|
|
removePathAccents bool
|
|
uglyURLs bool
|
|
canonifyURLs bool
|
|
|
|
language *Language
|
|
//StatsCounter *siteSta
|
|
|
|
// pagination path handling
|
|
paginatePath string
|
|
|
|
theme string
|
|
|
|
// Directories
|
|
contentDir string
|
|
themesDir string
|
|
layoutDir string
|
|
workingDir string
|
|
staticDirs []string
|
|
PublishDir string
|
|
|
|
// 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
|
|
|
|
ProcessingStats *ProcessingStats
|
|
|
|
// The file systems to use
|
|
Fs *hugofs.Fs
|
|
|
|
// The config provider to use
|
|
Cfg config.Provider
|
|
}
|
|
|
|
func (p PathSpec) String() string {
|
|
return fmt.Sprintf("PathSpec, language %q, prefix %q, multilingual: %T", p.language.Lang, p.getLanguagePrefix(), p.multilingual)
|
|
}
|
|
|
|
// NewPathSpec creats a new PathSpec from the given filesystems and Language.
|
|
func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) {
|
|
|
|
baseURLstr := cfg.GetString("baseURL")
|
|
baseURL, err := newBaseURLFromString(baseURLstr)
|
|
|
|
if err != nil {
|
|
return nil, fmt.Errorf("Failed to create baseURL from %q: %s", baseURLstr, err)
|
|
}
|
|
|
|
var staticDirs []string
|
|
|
|
for i := -1; i <= 10; i++ {
|
|
staticDirs = append(staticDirs, getStringOrStringSlice(cfg, "staticDir", i)...)
|
|
}
|
|
|
|
var lang string
|
|
if l, ok := cfg.(*Language); ok {
|
|
lang = l.Lang
|
|
}
|
|
|
|
ps := &PathSpec{
|
|
Fs: fs,
|
|
Cfg: cfg,
|
|
disablePathToLower: cfg.GetBool("disablePathToLower"),
|
|
removePathAccents: cfg.GetBool("removePathAccents"),
|
|
uglyURLs: cfg.GetBool("uglyURLs"),
|
|
canonifyURLs: cfg.GetBool("canonifyURLs"),
|
|
multilingual: cfg.GetBool("multilingual"),
|
|
defaultContentLanguageInSubdir: cfg.GetBool("defaultContentLanguageInSubdir"),
|
|
defaultContentLanguage: cfg.GetString("defaultContentLanguage"),
|
|
paginatePath: cfg.GetString("paginatePath"),
|
|
BaseURL: baseURL,
|
|
contentDir: cfg.GetString("contentDir"),
|
|
themesDir: cfg.GetString("themesDir"),
|
|
layoutDir: cfg.GetString("layoutDir"),
|
|
workingDir: cfg.GetString("workingDir"),
|
|
staticDirs: staticDirs,
|
|
theme: cfg.GetString("theme"),
|
|
ProcessingStats: NewProcessingStats(lang),
|
|
}
|
|
|
|
publishDir := ps.AbsPathify(cfg.GetString("publishDir")) + FilePathSeparator
|
|
// If root, remove the second '/'
|
|
if publishDir == "//" {
|
|
publishDir = FilePathSeparator
|
|
}
|
|
|
|
ps.PublishDir = publishDir
|
|
|
|
if language, ok := cfg.(*Language); ok {
|
|
ps.language = language
|
|
}
|
|
|
|
return ps, nil
|
|
}
|
|
|
|
func getStringOrStringSlice(cfg config.Provider, key string, id int) []string {
|
|
|
|
if id >= 0 {
|
|
key = fmt.Sprintf("%s%d", key, id)
|
|
}
|
|
|
|
var out []string
|
|
|
|
sd := cfg.Get(key)
|
|
|
|
if sds, ok := sd.(string); ok {
|
|
out = []string{sds}
|
|
} else if sd != nil {
|
|
out = cast.ToStringSlice(sd)
|
|
}
|
|
|
|
return out
|
|
}
|
|
|
|
// PaginatePath returns the configured root path used for paginator pages.
|
|
func (p *PathSpec) PaginatePath() string {
|
|
return p.paginatePath
|
|
}
|
|
|
|
// ContentDir returns the configured workingDir.
|
|
func (p *PathSpec) ContentDir() string {
|
|
return p.contentDir
|
|
}
|
|
|
|
// WorkingDir returns the configured workingDir.
|
|
func (p *PathSpec) WorkingDir() string {
|
|
return p.workingDir
|
|
}
|
|
|
|
// 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.
|
|
func (p *PathSpec) LayoutDir() string {
|
|
return p.layoutDir
|
|
}
|
|
|
|
// Theme returns the theme name if set.
|
|
func (p *PathSpec) Theme() string {
|
|
return p.theme
|
|
}
|
|
|
|
// Theme returns the theme relative theme dir.
|
|
func (p *PathSpec) ThemesDir() string {
|
|
return p.themesDir
|
|
}
|
|
|
|
// 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
|
|
|
|
}
|