From 5b01424e52c23a3f76182db9a7e24b6dbff3a61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Tue, 8 Jan 2019 12:13:45 +0100
Subject: [PATCH] Work

---
 hugolib/hugo_sites.go            |  7 ++++---
 hugolib/hugo_sites_build_test.go |  6 +++---
 hugolib/page.go                  | 19 -------------------
 hugolib/page_content.go          |  2 +-
 hugolib/pagebundler_handlers.go  |  2 +-
 hugolib/site.go                  | 19 +++++++++++++++++++
 resources/page/page.go           |  6 ++++++
 7 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index d850d397539..72ded4b91e0 100644
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -642,14 +642,15 @@ func (h *HugoSites) setupTranslations() {
 			pp := p.(*Page)
 			if p.Kind() == kindUnknown {
 				pp.kind = pp.kindFromSections()
+
 			}
 
 			if !pp.s.isEnabled(p.Kind()) {
 				continue
 			}
 
-			shouldBuild := pp.shouldBuild()
-			s.updateBuildStats(pp)
+			shouldBuild := s.shouldBuild(p)
+			s.updateBuildStats(p)
 			if shouldBuild {
 				if pp.headless {
 					s.headlessPages = append(s.headlessPages, p)
@@ -724,7 +725,7 @@ func handleShortcodes(p *PageWithoutContent, rawContentCopy []byte) ([]byte, err
 	return rawContentCopy, nil
 }
 
-func (s *Site) updateBuildStats(page *Page) {
+func (s *Site) updateBuildStats(page page.Page) {
 	if page.IsDraft() {
 		s.draftCount++
 	}
diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index 3b78459b15e..21a6e61d3dc 100644
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -623,11 +623,11 @@ func assertShouldNotBuild(t *testing.T, sites *HugoSites) {
 	for _, p := range s.rawAllPages {
 		pp := p.(*Page)
 		// No HTML when not processed
-		require.Equal(t, pp.shouldBuild(), bytes.Contains(pp.workContent, []byte("</")), pp.File().BaseFileName()+": "+string(pp.workContent))
+		require.Equal(t, s.shouldBuild(p), bytes.Contains(pp.workContent, []byte("</")), pp.File().BaseFileName()+": "+string(pp.workContent))
 
-		require.Equal(t, pp.shouldBuild(), pp.content() != "", fmt.Sprintf("%v:%v", pp.content(), pp.shouldBuild()))
+		require.Equal(t, s.shouldBuild(p), content(p) != "", fmt.Sprintf("%v:%v", content(p), s.shouldBuild(p)))
 
-		require.Equal(t, pp.shouldBuild(), pp.content() != "", pp.File().BaseFileName())
+		require.Equal(t, s.shouldBuild(p), content(p) != "", pp.File().BaseFileName())
 
 	}
 }
diff --git a/hugolib/page.go b/hugolib/page.go
index fc77717ed8b..23b870b25c3 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -996,25 +996,6 @@ func (p *Page) LinkTitle() string {
 	return p.title
 }
 
-func (p *Page) shouldBuild() bool {
-	return shouldBuild(p.s.BuildFuture, p.s.BuildExpired,
-		p.s.BuildDrafts, p.Draft, p.PublishDate(), p.ExpiryDate())
-}
-
-func shouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool,
-	publishDate time.Time, expiryDate time.Time) bool {
-	if !(buildDrafts || !Draft) {
-		return false
-	}
-	if !buildFuture && !publishDate.IsZero() && publishDate.After(time.Now()) {
-		return false
-	}
-	if !buildExpired && !expiryDate.IsZero() && expiryDate.Before(time.Now()) {
-		return false
-	}
-	return true
-}
-
 func (p *Page) IsDraft() bool {
 	return p.Draft
 }
diff --git a/hugolib/page_content.go b/hugolib/page_content.go
index b59142d51a9..7d12c2cf3cc 100644
--- a/hugolib/page_content.go
+++ b/hugolib/page_content.go
@@ -108,7 +108,7 @@ Loop:
 				p.source.posMainContent = next.Pos
 			}
 
-			if !p.shouldBuild() {
+			if !p.s.shouldBuild(p) {
 				// Nothing more to do.
 				return nil
 			}
diff --git a/hugolib/pagebundler_handlers.go b/hugolib/pagebundler_handlers.go
index 9aa55c3f6db..fd5be99c0da 100644
--- a/hugolib/pagebundler_handlers.go
+++ b/hugolib/pagebundler_handlers.go
@@ -210,7 +210,7 @@ func (c *contentHandlers) parsePage(h contentHandler) contentHandler {
 			return handlerResult{err: err}
 		}
 
-		if !p.shouldBuild() {
+		if !c.s.shouldBuild(p) {
 			if !ctx.doNotAddToSiteCollections {
 				ctx.pages <- p
 			}
diff --git a/hugolib/site.go b/hugolib/site.go
index 413fb9b08dc..a1c03dbced3 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1870,3 +1870,22 @@ func (s *Site) newTaxonomyTermsPage(plural string) *Page {
 	p.title = s.titleFunc(plural)
 	return p
 }
+
+func (s *Site) shouldBuild(p page.Page) bool {
+	return shouldBuild(s.BuildFuture, s.BuildExpired,
+		s.BuildDrafts, p.IsDraft(), p.PublishDate(), p.ExpiryDate())
+}
+
+func shouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool,
+	publishDate time.Time, expiryDate time.Time) bool {
+	if !(buildDrafts || !Draft) {
+		return false
+	}
+	if !buildFuture && !publishDate.IsZero() && publishDate.After(time.Now()) {
+		return false
+	}
+	if !buildExpired && !expiryDate.IsZero() && expiryDate.Before(time.Now()) {
+		return false
+	}
+	return true
+}
diff --git a/resources/page/page.go b/resources/page/page.go
index 8bf1b9d6026..3b099eca1dc 100644
--- a/resources/page/page.go
+++ b/resources/page/page.go
@@ -139,6 +139,12 @@ type pageAddons6 interface {
 	File() source.File
 
 	deprecatedPageMethods
+
+	pageAddons7
+}
+
+type pageAddons7 interface {
+	IsDraft() bool
 }
 
 type deprecatedPageMethods interface {