diff --git a/hugolib/page.go b/hugolib/page.go index 5e3fe1231..198f7ba14 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -467,12 +467,12 @@ func (p *Page) LinkTitle() string { return p.Title } -func (p *Page) ShouldBuild() bool { - return AssertShouldBuild(viper.GetBool("BuildFuture"), viper.GetBool("BuildExpired"), +func (p *Page) shouldBuild() bool { + return shouldBuild(viper.GetBool("BuildFuture"), viper.GetBool("BuildExpired"), viper.GetBool("BuildDrafts"), p.Draft, p.PublishDate, p.ExpiryDate) } -func AssertShouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool, +func shouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool, publishDate time.Time, expiryDate time.Time) bool { if !(buildDrafts || !Draft) { return false diff --git a/hugolib/page_test.go b/hugolib/page_test.go index 7a49c611c..8afb851ae 100644 --- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -1090,7 +1090,7 @@ func compareObjects(a interface{}, b interface{}) bool { return strings.Join(aStr, "") == strings.Join(bStr, "") } -func TestAssertShouldBuild(t *testing.T) { +func TestShouldBuild(t *testing.T) { var past = time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC) var future = time.Date(2037, 11, 17, 20, 34, 58, 651387237, time.UTC) var zero = time.Time{} @@ -1128,7 +1128,7 @@ func TestAssertShouldBuild(t *testing.T) { } for _, ps := range publishSettings { - s := AssertShouldBuild(ps.buildFuture, ps.buildExpired, ps.buildDrafts, ps.draft, + s := shouldBuild(ps.buildFuture, ps.buildExpired, ps.buildDrafts, ps.draft, ps.publishDate, ps.expiryDate) if s != ps.out { t.Errorf("AssertShouldBuild unexpected output with params: %+v", ps) diff --git a/hugolib/site.go b/hugolib/site.go index c23a5a582..2a850b3a9 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -996,7 +996,7 @@ func converterCollator(s *Site, results <-chan HandledResult, errs chan<- error) } func (s *Site) addPage(page *Page) { - if page.ShouldBuild() { + if page.shouldBuild() { s.Pages = append(s.Pages, page) }