mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-25 06:51:42 +00:00
3eb313fef4
This commit is a follow up to a recent overhaul of the GetPage/ref/relref implemenation. The most important change in this commit is the update to `.Site.GetPage`: * To reduce the amount of breakage in the wild to its minimum, I have reworked .Site.GetPage with some rules: * We cannot support more than 2 arguments, i.e. .Site.GetPage "page" "posts" "mypage.md" will now throw an error. I think this is the most uncommon syntax and should be OK. It is an easy fix to change the above to .Site.GetPage "/posts/mypage.md" or similar. * .Site.GetPage "home", .Site.GetPage "home" "" and .Site.GetPage "home" "/" will give you the home page. This means that if you have page in root with the name home.md you need to do .Site.GetPage "/home.md" or similar This commit also fixes some multilingual issues, most notable it is now possible to do cross-language ref/relref lookups by prepending the language code to the path, e.g. `/jp/posts/mypage.md`. This commit also reverts the site building tests related to this to "Hugo 0.44 state", to get better control of the changes made. Closes #4147 Closes #4727 Closes #4728 Closes #4728 Closes #4726 Closes #4652
99 lines
2.5 KiB
Go
99 lines
2.5 KiB
Go
// Copyright 2017-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 cache
|
|
|
|
import (
|
|
"sync"
|
|
)
|
|
|
|
// Partition represents a cache partition where Load is the callback
|
|
// for when the partition is needed.
|
|
type Partition struct {
|
|
Key string
|
|
Load func() (map[string]interface{}, error)
|
|
}
|
|
|
|
// Lazy represents a lazily loaded cache.
|
|
type Lazy struct {
|
|
initSync sync.Once
|
|
initErr error
|
|
cache map[string]interface{}
|
|
load func() (map[string]interface{}, error)
|
|
}
|
|
|
|
// NewLazy creates a lazy cache with the given load func.
|
|
func NewLazy(load func() (map[string]interface{}, error)) *Lazy {
|
|
return &Lazy{load: load}
|
|
}
|
|
|
|
func (l *Lazy) init() error {
|
|
l.initSync.Do(func() {
|
|
c, err := l.load()
|
|
l.cache = c
|
|
l.initErr = err
|
|
|
|
})
|
|
|
|
return l.initErr
|
|
}
|
|
|
|
// Get initializes the cache if not already initialized, then looks up the
|
|
// given key.
|
|
func (l *Lazy) Get(key string) (interface{}, bool, error) {
|
|
l.init()
|
|
if l.initErr != nil {
|
|
return nil, false, l.initErr
|
|
}
|
|
v, found := l.cache[key]
|
|
return v, found, nil
|
|
}
|
|
|
|
// PartitionedLazyCache is a lazily loaded cache paritioned by a supplied string key.
|
|
type PartitionedLazyCache struct {
|
|
partitions map[string]*Lazy
|
|
}
|
|
|
|
// NewPartitionedLazyCache creates a new NewPartitionedLazyCache with the supplied
|
|
// partitions.
|
|
func NewPartitionedLazyCache(partitions ...Partition) *PartitionedLazyCache {
|
|
lazyPartitions := make(map[string]*Lazy, len(partitions))
|
|
for _, partition := range partitions {
|
|
lazyPartitions[partition.Key] = NewLazy(partition.Load)
|
|
}
|
|
cache := &PartitionedLazyCache{partitions: lazyPartitions}
|
|
|
|
return cache
|
|
}
|
|
|
|
// Get initializes the partition if not already done so, then looks up the given
|
|
// key in the given partition, returns nil if no value found.
|
|
func (c *PartitionedLazyCache) Get(partition, key string) (interface{}, error) {
|
|
p, found := c.partitions[partition]
|
|
|
|
if !found {
|
|
return nil, nil
|
|
}
|
|
|
|
v, found, err := p.Get(key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if found {
|
|
return v, nil
|
|
}
|
|
|
|
return nil, nil
|
|
|
|
}
|