mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -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
129 lines
2.8 KiB
Go
129 lines
2.8 KiB
Go
// Copyright 2016 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 source
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"runtime"
|
|
"sync"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
"golang.org/x/text/unicode/norm"
|
|
)
|
|
|
|
type Filesystem struct {
|
|
files []ReadableFile
|
|
filesInit sync.Once
|
|
|
|
Base string
|
|
|
|
SourceSpec
|
|
}
|
|
|
|
type Input interface {
|
|
Files() []ReadableFile
|
|
}
|
|
|
|
func (sp SourceSpec) NewFilesystem(base string) *Filesystem {
|
|
return &Filesystem{SourceSpec: sp, Base: base}
|
|
}
|
|
|
|
func (f *Filesystem) Files() []ReadableFile {
|
|
f.filesInit.Do(func() {
|
|
f.captureFiles()
|
|
})
|
|
return f.files
|
|
}
|
|
|
|
// add populates a file in the Filesystem.files
|
|
func (f *Filesystem) add(name string, fi os.FileInfo) (err error) {
|
|
var file ReadableFile
|
|
|
|
if runtime.GOOS == "darwin" {
|
|
// When a file system is HFS+, its filepath is in NFD form.
|
|
name = norm.NFC.String(name)
|
|
}
|
|
|
|
file = f.SourceSpec.NewFileInfo(f.Base, name, fi)
|
|
f.files = append(f.files, file)
|
|
|
|
return err
|
|
}
|
|
|
|
func (f *Filesystem) captureFiles() {
|
|
walker := func(filePath string, fi os.FileInfo, err error) error {
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
b, err := f.shouldRead(filePath, fi)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if b {
|
|
f.add(filePath, fi)
|
|
}
|
|
return err
|
|
}
|
|
|
|
if f.Fs == nil {
|
|
panic("Must have a fs")
|
|
}
|
|
err := helpers.SymbolicWalk(f.Fs.Source, f.Base, walker)
|
|
|
|
if err != nil {
|
|
jww.ERROR.Println(err)
|
|
if err == helpers.ErrWalkRootTooShort {
|
|
panic("The root path is too short. If this is a test, make sure to init the content paths.")
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
func (f *Filesystem) shouldRead(filename string, fi os.FileInfo) (bool, error) {
|
|
if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
|
|
link, err := filepath.EvalSymlinks(filename)
|
|
if err != nil {
|
|
jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", filename, err)
|
|
return false, nil
|
|
}
|
|
linkfi, err := f.Fs.Source.Stat(link)
|
|
if err != nil {
|
|
jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
|
|
return false, nil
|
|
}
|
|
|
|
if !linkfi.Mode().IsRegular() {
|
|
jww.ERROR.Printf("Symbolic links for directories not supported, skipping '%s'", filename)
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
ignore := f.SourceSpec.IgnoreFile(filename)
|
|
|
|
if fi.IsDir() {
|
|
if ignore {
|
|
return false, filepath.SkipDir
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
if ignore {
|
|
return false, nil
|
|
}
|
|
|
|
return true, nil
|
|
}
|