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

Preserve file/dir name case when loading data

Browse source 
Fixes #11979
This commit is contained in:
Bjørn Erik Pedersen 2024-02-03 15:43:28 +01:00
parent 058f230a1b
commit 46575baa02
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
hugolib/datafiles_test.go
View file

@ -47,3 +47,20 @@ d: {{ site.Data.d.v1 }}|
b.AssertFileContent("public/index.html", "a: a_v1|\nb: b_v1|\ncd: c_d_v1|\nd: d_v1_theme|")
})
}
func TestDataMixedCaseFolders(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
-- data/MyFolder/MyData.toml --
v1 = "my_v1"
-- layouts/index.html --
{{ site.Data }}
v1: {{ site.Data.MyFolder.MyData.v1 }}|
`
b := Test(t, files)
b.AssertFileContent("public/index.html", "v1: my_v1|")
}

2
hugolib/hugo_sites.go
View file

@ -502,7 +502,7 @@ func (h *HugoSites) handleDataFile(r *source.File) error {
// Crawl in data tree to insert data
current = h.data
dataPath := r.FileInfo().Meta().PathInfo.Dir()[1:]
dataPath := r.FileInfo().Meta().PathInfo.Unmormalized().Dir()[1:]
keyParts := strings.Split(dataPath, "/")
for _, key := range keyParts {

2
hugolib/page_test.go
View file

@ -1713,7 +1713,7 @@ Single: {{ .Title}}|{{ .RelPermalink }}|{{ .Path }}|
b := Test(t, files)
b.AssertFileContent("public/sect/p1/index.html", "Single: Page1|/sect/p1/|/sect/p1")
b.AssertFileContent("public/sect/PaGe2/index.html", "Single: Page2|/sect/PaGe2/|/sect/p2")
b.AssertFileContent("public/sect2/page3/index.html", "Single: Page3|/sect2/page3/|/sect2/page3|")
b.AssertFileContent("public/sect2/PaGe3/index.html", "Single: Page3|/sect2/PaGe3/|/sect2/page3|")
b.AssertFileContent("public/sect3/Pag.E4/index.html", "Single: Pag.E4|/sect3/Pag.E4/|/sect3/p4|")
}

2
source/fileInfo.go
View file

@ -130,7 +130,7 @@ func (fi *File) pathToDir(s string) string {
}
func (fi *File) p() *paths.Path {
return fi.fim.Meta().PathInfo
return fi.fim.Meta().PathInfo.Unmormalized()
}
func NewFileInfoFrom(path, filename string) *File {