mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
9f5a92078a
This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092
164 lines
3.8 KiB
Go
164 lines
3.8 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.sourceFs = 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)}
|
|
}
|