mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Filter out duplicate content resource files
We do a slight normalisation of the content paths (lower case, replacing " " with "-") and remove andy language identifier before inserting them into the content tree. This means that, given that that the default content language is `en`: ``` index.md index.html Foo Bar.txt foo-bar.txt foo-bar.en.txt Foo-Bar.txt ``` The bundle above will be reduced to one content file with one resource (`foo-bar.txt`). Before this commit, what version of the `foo-bar.txt` you ended up with was undeterministic. No we pick the first determined by sort order. Note that the sort order is stable, but we recommend avoiding situations like the above. Closes #11946
This commit is contained in:
parent
7caa5b3e50
commit
bd66d30295
2 changed files with 29 additions and 2 deletions
|
@ -147,13 +147,13 @@ func (f *componentFsDir) ReadDir(count int) ([]iofs.DirEntry, error) {
|
|||
})
|
||||
|
||||
if f.fs.opts.Component == files.ComponentFolderContent {
|
||||
// Finally filter out any duplicate content files, e.g. page.md and page.html.
|
||||
// Finally filter out any duplicate content or resource files, e.g. page.md and page.html.
|
||||
n := 0
|
||||
seen := map[hstrings.Tuple]bool{}
|
||||
for _, fi := range fis {
|
||||
fim := fi.(FileMetaInfo)
|
||||
pi := fim.Meta().PathInfo
|
||||
keep := fim.IsDir() || !pi.IsContent()
|
||||
keep := fim.IsDir()
|
||||
|
||||
if !keep {
|
||||
baseLang := hstrings.Tuple{First: pi.Base(), Second: fim.Meta().Lang}
|
||||
|
|
|
@ -299,3 +299,30 @@ R: {{ with $r }}{{ .Content }}{{ end }}|
|
|||
|
||||
b.AssertFileContent("public/index.html", "R: Data.")
|
||||
}
|
||||
|
||||
// Issue #11946.
|
||||
func TestBundleResourcesGetDuplicateSortOrder(t *testing.T) {
|
||||
files := `
|
||||
-- hugo.toml --
|
||||
baseURL = "https://example.com"
|
||||
-- content/bundle/index.md --
|
||||
-- content/bundle/data-1.txt --
|
||||
data-1.txt
|
||||
-- content/bundle/data 1.txt --
|
||||
data 1.txt
|
||||
-- content/bundle/Data 1.txt --
|
||||
Data 1.txt
|
||||
-- content/bundle/Data-1.txt --
|
||||
Data-1.txt
|
||||
-- layouts/index.html --
|
||||
{{ $bundle := site.GetPage "bundle" }}
|
||||
{{ $r := $bundle.Resources.Get "data-1.txt" }}
|
||||
R: {{ with $r }}{{ .Content }}{{ end }}|Len: {{ len $bundle.Resources }}|$
|
||||
|
||||
`
|
||||
|
||||
for i := 0; i < 3; i++ {
|
||||
b := Test(t, files)
|
||||
b.AssertFileContent("public/index.html", "R: Data 1.txt|", "Len: 1|")
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue