summaryrefslogtreecommitdiffstats
path: root/hugolib/page.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-01-04 18:24:36 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-05-16 18:01:29 +0200
commit241b21b0fd34d91fccb2ce69874110dceae6f926 (patch)
treed4e0118eac7e9c42f065815447a70805f8d6ad3e /hugolib/page.go
parent6aededf6b42011c3039f5f66487a89a8dd65e0e7 (diff)
Create a struct with all of Hugo's config options
Primary motivation is documentation, but it will also hopefully simplify the code. Also, * Lower case the default output format names; this is in line with the custom ones (map keys) and how it's treated all the places. This avoids doing `stringds.EqualFold` everywhere. Closes #10896 Closes #10620
Diffstat (limited to 'hugolib/page.go')
-rw-r--r--hugolib/page.go17
1 files changed, 9 insertions, 8 deletions
diff --git a/hugolib/page.go b/hugolib/page.go
index ebc29df47..7356cb545 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -25,6 +25,9 @@ import (
"go.uber.org/atomic"
"github.com/gohugoio/hugo/identity"
+ "github.com/gohugoio/hugo/media"
+ "github.com/gohugoio/hugo/output"
+ "github.com/gohugoio/hugo/output/layouts"
"github.com/gohugoio/hugo/related"
"github.com/gohugoio/hugo/markup/converter"
@@ -41,9 +44,6 @@ import (
"github.com/gohugoio/hugo/parser/pageparser"
- "github.com/gohugoio/hugo/output"
-
- "github.com/gohugoio/hugo/media"
"github.com/gohugoio/hugo/source"
"github.com/gohugoio/hugo/common/collections"
@@ -60,7 +60,7 @@ var (
)
var (
- pageTypesProvider = resource.NewResourceTypesProvider(media.OctetType, pageResourceType)
+ pageTypesProvider = resource.NewResourceTypesProvider(media.Builtin.OctetType, pageResourceType)
nopPageOutput = &pageOutput{
pagePerOutputProviders: nopPagePerOutput,
ContentProvider: page.NopPage,
@@ -146,6 +146,7 @@ func (p *pageState) Eq(other any) bool {
return p == pp
}
+// GetIdentify is for internal use.
func (p *pageState) GetIdentity() identity.Identity {
return identity.NewPathIdentity(files.ComponentFolderContent, filepath.FromSlash(p.Pathc()))
}
@@ -369,7 +370,7 @@ func (p *pageState) HasShortcode(name string) bool {
}
func (p *pageState) Site() page.Site {
- return p.s.Info
+ return p.sWrapped
}
func (p *pageState) String() string {
@@ -427,12 +428,12 @@ func (ps *pageState) initCommonProviders(pp pagePaths) error {
ps.OutputFormatsProvider = pp
ps.targetPathDescriptor = pp.targetPathDescriptor
ps.RefProvider = newPageRef(ps)
- ps.SitesProvider = ps.s.Info
+ ps.SitesProvider = ps.s
return nil
}
-func (p *pageState) getLayoutDescriptor() output.LayoutDescriptor {
+func (p *pageState) getLayoutDescriptor() layouts.LayoutDescriptor {
p.layoutDescriptorInit.Do(func() {
var section string
sections := p.SectionsEntries()
@@ -448,7 +449,7 @@ func (p *pageState) getLayoutDescriptor() output.LayoutDescriptor {
default:
}
- p.layoutDescriptor = output.LayoutDescriptor{
+ p.layoutDescriptor = layouts.LayoutDescriptor{
Kind: p.Kind(),
Type: p.Type(),
Lang: p.Language().Lang,