github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix recent regression .Resources.Get for resources with spaces in filename

Browse source 
Fixes #11944
This commit is contained in:
Bjørn Erik Pedersen 2024-01-30 10:42:24 +01:00
parent afee781f03
commit 80595bbe3e
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/content_map_page.go
View file

@ -1548,7 +1548,7 @@ func (sa *sitePagesAssembler) assembleResources() error {
return false, nil return false, nil
} }
relPathOriginal := rs.path.PathRel(ps.m.pathInfo) relPathOriginal := rs.path.Unmormalized().PathRel(ps.m.pathInfo.Unmormalized())
relPath := rs.path.BaseRel(ps.m.pathInfo) relPath := rs.path.BaseRel(ps.m.pathInfo)
var targetBasePaths []string var targetBasePaths []string

19
hugolib/content_map_test.go
View file

@ -280,3 +280,22 @@ P1: {{ $p1.Title }}|{{ $p1.Params.foo }}|{{ $p1.File.Filename }}|
filepath.FromSlash("P1: P1 md|md|/content/p1.md|"), filepath.FromSlash("P1: P1 md|md|/content/p1.md|"),
) )
} }
// Issue #11944
func TestBundleResourcesGetWithSpacesInFilename(t *testing.T) {
files := `
-- hugo.toml --
baseURL = "https://example.com"
disableKinds = ["taxonomy", "term"]
-- content/bundle/index.md --
-- content/bundle/data with Spaces.txt --
Data.
-- layouts/index.html --
{{ $bundle := site.GetPage "bundle" }}
{{ $r := $bundle.Resources.Get "data with Spaces.txt" }}
R: {{ with $r }}{{ .Content }}{{ end }}|
`
b := Test(t, files)
b.AssertFileContent("public/index.html", "R: Data.")
}

3
resources/page/pagemeta/page_frontmatter.go
View file

@ -57,7 +57,7 @@ func (d Dates) IsAllDatesZero() bool {
// Note that all the top level fields are reserved Hugo keywords. // Note that all the top level fields are reserved Hugo keywords.
// Any custom configuration needs to be set in the Params map. // Any custom configuration needs to be set in the Params map.
type PageConfig struct { type PageConfig struct {
Dates // Dates holds the fource core dates for this page. Dates // Dates holds the four core dates for this page.
Title string // The title of the page. Title string // The title of the page.
LinkTitle string // The link title of the page. LinkTitle string // The link title of the page.
Type string // The content type of the page. Type string // The content type of the page.
@ -66,6 +66,7 @@ type PageConfig struct {
Weight int // The weight of the page, used in sorting if set to a non-zero value. Weight int // The weight of the page, used in sorting if set to a non-zero value.
Kind string // The kind of page, e.g. "page", "section", "home" etc. This is usually derived from the content path. Kind string // The kind of page, e.g. "page", "section", "home" etc. This is usually derived from the content path.
Path string // The canonical path to the page, e.g. /sect/mypage. Note: Leading slash, no trailing slash, no extensions or language identifiers. Path string // The canonical path to the page, e.g. /sect/mypage. Note: Leading slash, no trailing slash, no extensions or language identifiers.
URL string // The URL to the rendered page, e.g. /sect/mypage.html.
Lang string // The language code for this page. This is usually derived from the module mount or filename. Lang string // The language code for this page. This is usually derived from the module mount or filename.
Slug string // The slug for this page. Slug string // The slug for this page.
Description string // The description for this page. Description string // The description for this page.