mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 08:12:06 -05:00
597e418cb0
The main motivation of this commit is to add a `page.Page` interface to replace the very file-oriented `hugolib.Page` struct. This is all a preparation step for issue #5074, "pages from other data sources". But this also fixes a set of annoying limitations, especially related to custom output formats, and shortcodes. Most notable changes: * The inner content of shortcodes using the `{{%` as the outer-most delimiter will now be sent to the content renderer, e.g. Blackfriday. This means that any markdown will partake in the global ToC and footnote context etc. * The Custom Output formats are now "fully virtualized". This removes many of the current limitations. * The taxonomy list type now has a reference to the `Page` object. This improves the taxonomy template `.Title` situation and make common template constructs much simpler. See #5074 Fixes #5763 Fixes #5758 Fixes #5090 Fixes #5204 Fixes #4695 Fixes #5607 Fixes #5707 Fixes #5719 Fixes #3113 Fixes #5706 Fixes #5767 Fixes #5723 Fixes #5769 Fixes #5770 Fixes #5771 Fixes #5759 Fixes #5776 Fixes #5777 Fixes #5778
164 lines
3.9 KiB
Go
164 lines
3.9 KiB
Go
// Copyright 2019 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 resources
|
|
|
|
import (
|
|
"image"
|
|
"io"
|
|
"path/filepath"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/gohugoio/hugo/common/hugio"
|
|
|
|
"github.com/gohugoio/hugo/cache/filecache"
|
|
"github.com/gohugoio/hugo/helpers"
|
|
)
|
|
|
|
type imageCache struct {
|
|
pathSpec *helpers.PathSpec
|
|
|
|
fileCache *filecache.Cache
|
|
|
|
mu sync.RWMutex
|
|
store map[string]*Image
|
|
}
|
|
|
|
func (c *imageCache) isInCache(key string) bool {
|
|
c.mu.RLock()
|
|
_, found := c.store[c.normalizeKey(key)]
|
|
c.mu.RUnlock()
|
|
return found
|
|
}
|
|
|
|
func (c *imageCache) deleteByPrefix(prefix string) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
prefix = c.normalizeKey(prefix)
|
|
for k := range c.store {
|
|
if strings.HasPrefix(k, prefix) {
|
|
delete(c.store, k)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *imageCache) normalizeKey(key string) string {
|
|
// It is a path with Unix style slashes and it always starts with a leading slash.
|
|
key = filepath.ToSlash(key)
|
|
if !strings.HasPrefix(key, "/") {
|
|
key = "/" + key
|
|
}
|
|
|
|
return key
|
|
}
|
|
|
|
func (c *imageCache) clear() {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.store = make(map[string]*Image)
|
|
}
|
|
|
|
func (c *imageCache) getOrCreate(
|
|
parent *Image, conf imageConfig, createImage func() (*Image, image.Image, error)) (*Image, error) {
|
|
|
|
relTarget := parent.relTargetPathFromConfig(conf)
|
|
key := parent.relTargetPathForRel(relTarget.path(), false, false, false)
|
|
|
|
// First check the in-memory store, then the disk.
|
|
c.mu.RLock()
|
|
img, found := c.store[key]
|
|
c.mu.RUnlock()
|
|
|
|
if found {
|
|
return img, nil
|
|
}
|
|
|
|
// These funcs are protected by a named lock.
|
|
// read clones the parent to its new name and copies
|
|
// the content to the destinations.
|
|
read := func(info filecache.ItemInfo, r io.Reader) error {
|
|
img = parent.clone()
|
|
img.relTargetDirFile.file = relTarget.file
|
|
img.sourceFilename = info.Name
|
|
|
|
w, err := img.openDestinationsForWriting()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if w == nil {
|
|
// Nothing to write.
|
|
return nil
|
|
}
|
|
|
|
defer w.Close()
|
|
_, err = io.Copy(w, r)
|
|
return err
|
|
}
|
|
|
|
// create creates the image and encodes it to w (cache) and to its destinations.
|
|
create := func(info filecache.ItemInfo, w io.WriteCloser) (err error) {
|
|
var conv image.Image
|
|
img, conv, err = createImage()
|
|
if err != nil {
|
|
w.Close()
|
|
return
|
|
}
|
|
img.relTargetDirFile.file = relTarget.file
|
|
img.sourceFilename = info.Name
|
|
|
|
destinations, err := img.openDestinationsForWriting()
|
|
if err != nil {
|
|
w.Close()
|
|
return err
|
|
}
|
|
|
|
if destinations != nil {
|
|
w = hugio.NewMultiWriteCloser(w, destinations)
|
|
}
|
|
defer w.Close()
|
|
|
|
return img.encodeTo(conf, conv, w)
|
|
}
|
|
|
|
// Now look in the file cache.
|
|
|
|
// The definition of this counter is not that we have processed that amount
|
|
// (e.g. resized etc.), it can be fetched from file cache,
|
|
// but the count of processed image variations for this site.
|
|
c.pathSpec.ProcessingStats.Incr(&c.pathSpec.ProcessingStats.ProcessedImages)
|
|
|
|
_, err := c.fileCache.ReadOrCreate(key, read, create)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// The file is now stored in this cache.
|
|
img.overriddenSourceFs = c.fileCache.Fs
|
|
|
|
c.mu.Lock()
|
|
if img2, found := c.store[key]; found {
|
|
c.mu.Unlock()
|
|
return img2, nil
|
|
}
|
|
c.store[key] = img
|
|
c.mu.Unlock()
|
|
|
|
return img, nil
|
|
|
|
}
|
|
|
|
func newImageCache(fileCache *filecache.Cache, ps *helpers.PathSpec) *imageCache {
|
|
return &imageCache{fileCache: fileCache, pathSpec: ps, store: make(map[string]*Image)}
|
|
}
|