Misc depreation updates

* Deprecate .Page.Path when backed by a file
* site.Permalinks
* --ignoreVendor (use --ignoreVendorPaths)

Closes #9348
Closes #9349
This commit is contained in:
Bjørn Erik Pedersen
2022-01-04 13:07:10 +01:00
parent 56ab83a597
commit 2b6063c3e3
19 changed files with 52 additions and 58 deletions

View File

@@ -180,6 +180,9 @@ type PageMetaProvider interface {
// to the source of this Page. It will be relative to any content root.
Path() string
// This is just a temporary bridge method. Use Path in templates.
Pathc() string
// The slug, typically defined in front matter.
Slug() string
@@ -392,5 +395,4 @@ type DeprecatedWarningPageMethods1 interface {
// Move here to trigger ERROR instead of WARNING.
// TODO(bep) create wrappers and put into the Page once it has some methods.
type DeprecatedErrorPageMethods interface {
}
type DeprecatedErrorPageMethods interface{}

View File

@@ -17,6 +17,9 @@ package page
import (
"encoding/json"
"html/template"
"time"
"github.com/bep/gitmap"
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/config"
@@ -26,8 +29,6 @@ import (
"github.com/gohugoio/hugo/media"
"github.com/gohugoio/hugo/navigation"
"github.com/gohugoio/hugo/source"
"html/template"
"time"
)
func MarshalPageToJSON(p Page) ([]byte, error) {
@@ -68,7 +69,7 @@ func MarshalPageToJSON(p Page) ([]byte, error) {
linkTitle := p.LinkTitle()
isNode := p.IsNode()
isPage := p.IsPage()
path := p.Path()
path := p.Pathc()
slug := p.Slug()
lang := p.Lang()
isSection := p.IsSection()

View File

@@ -59,7 +59,7 @@ func (m PageMatcher) Matches(p Page) bool {
if m.Path != "" {
g, err := glob.GetGlob(m.Path)
// TODO(bep) Path() vs filepath vs leading slash.
p := strings.ToLower(filepath.ToSlash(p.Path()))
p := strings.ToLower(filepath.ToSlash(p.Pathc()))
if !(strings.HasPrefix(p, "/")) {
p = "/" + p
}
@@ -104,7 +104,6 @@ func DecodeCascade(in interface{}) (map[PageMatcher]maps.Params, error) {
}
return cascade, nil
}
// DecodePageMatcher decodes m into v.

View File

@@ -338,6 +338,10 @@ func (p *nopPage) Path() string {
return ""
}
func (p *nopPage) Pathc() string {
return ""
}
func (p *nopPage) Permalink() string {
return ""
}

View File

@@ -414,6 +414,10 @@ func (p *testPage) Path() string {
return p.path
}
func (p *testPage) Pathc() string {
return p.path
}
func (p *testPage) Permalink() string {
panic("not implemented")
}