mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-23 21:53:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

resources/page: Revise the new contentbasename permalinks tokens

Browse Source 
* Make it work for all pages, including those created from content adapters and not backed by a file.
* Allow the `slug` to win, so the new tokens are:

`:contentbasename`:

1. ContentBaseName

`:slugorcontentbasename`:

1. Slug
2. ContentBaseName

Note that a page will always have a `ContentBaseName`, so no need to fall back to e.g. the title.

Closes #11722
This commit is contained in:
Bjørn Erik Pedersen
2025-02-12 22:36:24 +01:00
parent cb7a4339b7
commit 7b7a0f3624
6 changed files with 145 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
resources/page/permalinks_test.go
View File

@@ -22,6 +22,7 @@ import (
"time"
qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/source"
)
// testdataPermalinks is used by a couple of tests; the expandsTo content is
@@ -29,32 +30,44 @@ import (
var testdataPermalinks = []struct {
spec string
valid bool
withPage func(p *testPage)
expandsTo string
}{
{":title", true, "spf13-vim-3.0-release-and-new-website"},
{"/:year-:month-:title", true, "/2012-04-spf13-vim-3.0-release-and-new-website"},
{"/:year/:yearday/:month/:monthname/:day/:weekday/:weekdayname/", true, "/2012/97/04/April/06/5/Friday/"}, // Dates
{"/:section/", true, "/blue/"}, // Section
{"/:title/", true, "/spf13-vim-3.0-release-and-new-website/"}, // Title
{"/:slug/", true, "/the-slug/"}, // Slug
{"/:slugorfilename/", true, "/the-slug/"}, // Slug or filename
{"/:filename/", true, "/test-page/"}, // Filename
{"/:06-:1-:2-:Monday", true, "/12-4-6-Friday"}, // Dates with Go formatting
{"/:2006_01_02_15_04_05.000", true, "/2012_04_06_03_01_59.000"}, // Complicated custom date format
{"/:sections/", true, "/a/b/c/"}, // Sections
{"/:sections[last]/", true, "/c/"}, // Sections
{"/:sections[0]/:sections[last]/", true, "/a/c/"}, // Sections
{"/\\:filename", true, "/:filename"}, // Escape sequence
{"/special\\::slug/", true, "/special:the-slug/"}, // Escape sequence
{"/:contentbasename/", true, "/index/"}, // Content base name
{"/:contentbasenameorslug/", true, "/index/"}, // Content base name or slug
{":title", true, nil, "spf13-vim-3.0-release-and-new-website"},
{"/:year-:month-:title", true, nil, "/2012-04-spf13-vim-3.0-release-and-new-website"},
{"/:year/:yearday/:month/:monthname/:day/:weekday/:weekdayname/", true, nil, "/2012/97/04/April/06/5/Friday/"}, // Dates
{"/:section/", true, nil, "/blue/"}, // Section
{"/:title/", true, nil, "/spf13-vim-3.0-release-and-new-website/"}, // Title
{"/:slug/", true, nil, "/the-slug/"}, // Slug
{"/:slugorfilename/", true, nil, "/the-slug/"}, // Slug or filename
{"/:filename/", true, nil, "/test-page/"}, // Filename
{"/:06-:1-:2-:Monday", true, nil, "/12-4-6-Friday"}, // Dates with Go formatting
{"/:2006_01_02_15_04_05.000", true, nil, "/2012_04_06_03_01_59.000"}, // Complicated custom date format
{"/:sections/", true, nil, "/a/b/c/"}, // Sections
{"/:sections[last]/", true, nil, "/c/"}, // Sections
{"/:sections[0]/:sections[last]/", true, nil, "/a/c/"}, // Sections
{"/\\:filename", true, nil, "/:filename"}, // Escape sequence
{"/special\\::slug/", true, nil, "/special:the-slug/"},
// contentbasename. // Escape sequence
{"/:contentbasename/", true, nil, "/test-page/"},
// slug, contentbasename. // Content base name
{"/:slugorcontentbasename/", true, func(p *testPage) {
p.slug = ""
}, "/test-page/"},
{"/:slugorcontentbasename/", true, func(p *testPage) {
p.slug = "myslug"
}, "/myslug/"},
{"/:slugorcontentbasename/", true, func(p *testPage) {
p.slug = ""
p.title = "mytitle"
p.file = source.NewContentFileInfoFrom("/", "_index.md")
}, "/test-page/"},
// Failures
{"/blog/:fred", false, ""},
{"/:year//:title", false, ""},
{"/:TITLE", false, ""}, // case is not normalized
{"/:2017", false, ""}, // invalid date format
{"/:2006-01-02", false, ""}, // valid date format but invalid attribute name
{"/blog/:fred", false, nil, ""},
{"/:year//:title", false, nil, ""},
{"/:TITLE", false, nil, ""}, // case is not normalized
{"/:2017", false, nil, ""}, // invalid date format
{"/:2006-01-02", false, nil, ""}, // valid date format but invalid attribute name
}
func urlize(uri string) string {
@@ -67,21 +80,30 @@ func TestPermalinkExpansion(t *testing.T) {
c := qt.New(t)
page := newTestPageWithFile("/test-page/index.md")
page.title = "Spf13 Vim 3.0 Release and new website"
d, _ := time.Parse("2006-01-02 15:04:05", "2012-04-06 03:01:59")
page.date = d
page.section = "blue"
page.slug = "The Slug"
page.kind = "page"
newPage := func() *testPage {
page := newTestPageWithFile("/test-page/index.md")
page.title = "Spf13 Vim 3.0 Release and new website"
d, _ := time.Parse("2006-01-02 15:04:05", "2012-04-06 03:01:59")
page.date = d
page.section = "blue"
page.slug = "The Slug"
page.kind = "page"
// page.pathInfo
return page
}
for _, item := range testdataPermalinks {
for i, item := range testdataPermalinks {
if !item.valid {
continue
}
page := newPage()
if item.withPage != nil {
item.withPage(page)
}
specNameCleaner := regexp.MustCompile(`[\:\/\[\]]`)
name := specNameCleaner.ReplaceAllString(item.spec, "")
name := fmt.Sprintf("[%d] %s", i, specNameCleaner.ReplaceAllString(item.spec, "_"))
c.Run(name, func(c *qt.C) {
patterns := map[string]map[string]string{