mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-29 07:00:31 +03:00
Fall back to original name in Resources.GetMatch/Match
Same as we do in .Get. Fixes #12076
This commit is contained in:
parent
a118cb4138
commit
48eec2a4e6
2 changed files with 36 additions and 0 deletions
|
@ -876,3 +876,20 @@ RegularPages: {{ range .RegularPages }}{{ .RelPermalink }}|File LogicalName: {{
|
||||||
"List: |/mysection|File LogicalName: _index.md|/mysection/|section|Resources: sectiondata.json: Secion data JSON.|sectiondata.txt: Section data TXT.|$",
|
"List: |/mysection|File LogicalName: _index.md|/mysection/|section|Resources: sectiondata.json: Secion data JSON.|sectiondata.txt: Section data TXT.|$",
|
||||||
"RegularPages: /mysection/foo/p2/|File LogicalName: p2.md|/mysection/mybundle/|File LogicalName: index.md|/mysection/p2/|File LogicalName: p2.md|$")
|
"RegularPages: /mysection/foo/p2/|File LogicalName: p2.md|/mysection/mybundle/|File LogicalName: index.md|/mysection/p2/|File LogicalName: p2.md|$")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBundleResourcesGetMatchOriginalName(t *testing.T) {
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
baseURL = "https://example.com"
|
||||||
|
-- content/mybundle/index.md --
|
||||||
|
-- content/mybundle/f1.en.txt --
|
||||||
|
F1.
|
||||||
|
-- layouts/_default/single.html --
|
||||||
|
GetMatch: {{ with .Resources.GetMatch "f1.en.*" }}{{ .Name }}: {{ .Content }}|{{ end }}
|
||||||
|
Match: {{ range .Resources.Match "f1.en.*" }}{{ .Name }}: {{ .Content }}|{{ end }}
|
||||||
|
`
|
||||||
|
|
||||||
|
b := Test(t, files)
|
||||||
|
|
||||||
|
b.AssertFileContent("public/mybundle/index.html", "GetMatch: f1.txt: F1.|", "Match: f1.txt: F1.|")
|
||||||
|
}
|
||||||
|
|
|
@ -106,6 +106,15 @@ func (r Resources) GetMatch(pattern any) Resource {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Finally, check the original name.
|
||||||
|
for _, resource := range r {
|
||||||
|
if nop, ok := resource.(NameOriginalProvider); ok {
|
||||||
|
if g.Match(paths.NormalizePathStringBasic(nop.NameOriginal())) {
|
||||||
|
return resource
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,6 +144,16 @@ func (r Resources) Match(pattern any) Resources {
|
||||||
matches = append(matches, resource)
|
matches = append(matches, resource)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if len(matches) == 0 {
|
||||||
|
// Fall back to the original name.
|
||||||
|
for _, resource := range r {
|
||||||
|
if nop, ok := resource.(NameOriginalProvider); ok {
|
||||||
|
if g.Match(strings.ToLower(nop.NameOriginal())) {
|
||||||
|
matches = append(matches, resource)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return matches
|
return matches
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue