Fix mainSections logic

Fixes #6217

diff --git a/hugolib/pagecollections.go b/hugolib/pagecollections.go
index 01a194ac1f8a6b5695ff9e3136ccd9034d5ca98b..4711d3de381fc89de16a6aae46b9505cc3e54e0b 100644 (file)
--- a/hugolib/pagecollections.go
+++ b/hugolib/pagecollections.go
@@ -441,7 +441,7 @@ func (c *PageCollections) createWorkAllPages() error {
 
                if parentBucket != nil {
 
-                       if !mainSectionsFound && strings.Count(s, "/") == 1 {
+                       if !mainSectionsFound && strings.Count(s, "/") == 1 && bucket.owner.IsSection() {
                                // Root section
                                rootBuckets = append(rootBuckets, bucket)
                        }

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 74424cd3d3bb87dd4eecc74b593ca3bc8bcd96f0..6cbcbf8d55735bd4786af31e98be0083a0a8e043 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -20,6 +20,8 @@ import (
        "strings"
        "testing"
 
+       "github.com/spf13/viper"
+
        "github.com/markbates/inflect"
 
        "github.com/gohugoio/hugo/helpers"
@@ -364,6 +366,61 @@ func TestShouldNotWriteZeroLengthFilesToDestination(t *testing.T) {
        th.assertFileNotExist(filepath.Join("public", "index.html"))
 }
 
+func TestMainSections(t *testing.T) {
+       c := qt.New(t)
+       for _, paramSet := range []bool{false, true} {
+               c.Run(fmt.Sprintf("param-%t", paramSet), func(c *qt.C) {
+                       v := viper.New()
+                       if paramSet {
+                               v.Set("params", map[string]interface{}{
+                                       "mainSections": []string{"a1", "a2"},
+                               })
+                       }
+
+                       b := newTestSitesBuilder(c).WithViper(v)
+
+                       for i := 0; i < 20; i++ {
+                               b.WithContent(fmt.Sprintf("page%d.md", i), `---
+title: "Page"
+---
+`)
+                       }
+
+                       for i := 0; i < 5; i++ {
+                               b.WithContent(fmt.Sprintf("blog/page%d.md", i), `---
+title: "Page"
+tags: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"]
+---
+`)
+                       }
+
+                       for i := 0; i < 3; i++ {
+                               b.WithContent(fmt.Sprintf("docs/page%d.md", i), `---
+title: "Page"
+---
+`)
+                       }
+
+                       b.WithTemplates("index.html", `
+mainSections: {{ .Site.Params.mainSections }}
+
+{{ range (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
+Main section page: {{ .RelPermalink }}
+{{ end }}
+`)
+
+                       b.Build(BuildCfg{})
+
+                       if paramSet {
+                               b.AssertFileContent("public/index.html", "mainSections: [a1 a2]")
+                       } else {
+                               b.AssertFileContent("public/index.html", "mainSections: [blog]", "Main section page: /blog/page3/")
+                       }
+
+               })
+       }
+}
+
 // Issue #1176
 func TestSectionNaming(t *testing.T) {
        for _, canonify := range []bool{true, false} {