Skip to content
Permalink
Browse files

hugolib: Allow index.md inside bundles

Fixes #6208
  • Loading branch information...
bep committed Aug 17, 2019
1 parent 18836a7 commit 4b4bdcfe740d988e4cfb4fee53eced6985576abd
Showing with 47 additions and 0 deletions.
  1. +42 −0 hugolib/pagebundler_test.go
  2. +5 −0 hugolib/pages_capture.go
@@ -1176,3 +1176,45 @@ Num Pages: {{ len .Site.Pages }}
)

}

// #6208
func TestBundleIndexInSubFolder(t *testing.T) {
config := `
baseURL = "https://example.com"
`

const pageContent = `---
title: %q
---
`
createPage := func(s string) string {
return fmt.Sprintf(pageContent, s)
}

b := newTestSitesBuilder(t).WithConfigFile("toml", config)
b.WithLogger(loggers.NewWarningLogger())

b.WithTemplates("_default/single.html", `{{ range .Resources }}
{{ .ResourceType }}|{{ .Title }}|
{{ end }}
`)

b.WithContent("bundle/index.md", createPage("bundle index"))
b.WithContent("bundle/p1.md", createPage("bundle p1"))
b.WithContent("bundle/sub/p2.md", createPage("bundle sub p2"))
b.WithContent("bundle/sub/index.md", createPage("bundle sub index"))
b.WithContent("bundle/sub/data.json", "data")

b.Build(BuildCfg{})

b.AssertFileContent("public/bundle/index.html", `
json|sub/data.json|
page|bundle p1|
page|bundle sub index|
page|bundle sub p2|
`)

}
@@ -370,6 +370,11 @@ func (c *pagesCollector) addToBundle(info hugofs.FileMetaInfo, btyp bundleDirTyp
lang := c.getLang(info)
bundle := getBundle(lang)
isBundleHeader := c.isBundleHeader(info)
if bundle != nil && isBundleHeader {
// index.md file inside a bundle, see issue 6208.
info.Meta()["classifier"] = files.ContentClassContent
isBundleHeader = false
}
classifier := info.Meta().Classifier()
isContent := classifier == files.ContentClassContent
if bundle == nil {

0 comments on commit 4b4bdcf

Please sign in to comment.
You can’t perform that action at this time.