Make sure drafts etc. are not processed

See #2309

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index f0012d2af72a9637c7df53eb1d46835d956a5866..addcdfc7db7ac3a7076a8dca5004aea093b5c1b1 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -242,7 +242,7 @@ func (h *HugoSites) Rebuild(config BuildCfg, events ...fsnotify.Event) error {
                s.resetBuildState()
        }
 
-       sourceChanged, err := firstSite.ReBuild(events)
+       sourceChanged, err := firstSite.reBuild(events)
 
        if err != nil {
                return err

diff --git a/hugolib/hugo_sites_test.go b/hugolib/hugo_sites_test.go
index e2a110d18929bfab18563f3fdc8f974b48bbff11..655feba0f49f5b5ca11dfb1139940ae649e46b6d 100644 (file)
--- a/hugolib/hugo_sites_test.go
+++ b/hugolib/hugo_sites_test.go
@@ -1,6 +1,7 @@
 package hugolib
 
 import (
+       "bytes"
        "fmt"
        "strings"
        "testing"
@@ -141,6 +142,9 @@ func TestMultiSitesBuild(t *testing.T) {
        assert.False(t, strings.Contains(string(doc1en.Content), "«"), string(doc1en.Content))
        assert.True(t, strings.Contains(string(doc1en.Content), "“"), string(doc1en.Content))
 
+       // Check that the drafts etc. are not built/processed/rendered.
+       assertShouldNotBuild(t, sites)
+
 }
 
 func TestMultiSitesRebuild(t *testing.T) {
@@ -303,6 +307,30 @@ func TestMultiSitesRebuild(t *testing.T) {
 
                this.assertFunc(t)
        }
+
+       // Check that the drafts etc. are not built/processed/rendered.
+       assertShouldNotBuild(t, sites)
+
+}
+
+func assertShouldNotBuild(t *testing.T, sites *HugoSites) {
+       s := sites.Sites[0]
+
+       for _, p := range s.rawAllPages {
+               // No HTML when not processed
+               require.Equal(t, p.shouldBuild(), bytes.Contains(p.rawContent, []byte("</")), p.BaseFileName()+": "+string(p.rawContent))
+               require.Equal(t, p.shouldBuild(), p.Content != "", p.BaseFileName())
+
+               require.Equal(t, p.shouldBuild(), p.Content != "", p.BaseFileName())
+
+               filename := filepath.Join("public", p.TargetPath())
+               if strings.HasSuffix(filename, ".html") {
+                       // TODO(bep) the end result is correct, but it is weird that we cannot use targetPath directly here.
+                       filename = strings.Replace(filename, ".html", "/index.html", 1)
+               }
+
+               require.Equal(t, p.shouldBuild(), destinationExists(filename), filename)
+       }
 }
 
 func TestAddNewLanguage(t *testing.T) {
@@ -579,6 +607,14 @@ func readDestination(t *testing.T, filename string) string {
        return readFileFromFs(t, hugofs.Destination(), filename)
 }
 
+func destinationExists(filename string) bool {
+       b, err := helpers.Exists(filename, hugofs.Destination())
+       if err != nil {
+               panic(err)
+       }
+       return b
+}
+
 func readSource(t *testing.T, filename string) string {
        return readFileFromFs(t, hugofs.Source(), filename)
 }

diff --git a/hugolib/site.go b/hugolib/site.go
index 1029a38bf56e35c992e8e1781ad99bd365a8b129..00805f8f9378c9a0d35c959e9c90177a7e174a5f 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -437,9 +437,9 @@ func (s *Site) timerStep(step string) {
        s.timer.Step(step)
 }
 
-// ReBuild partially rebuilds a site given the filesystem events.
+// reBuild partially rebuilds a site given the filesystem events.
 // It returns whetever the content source was changed.
-func (s *Site) ReBuild(events []fsnotify.Event) (bool, error) {
+func (s *Site) reBuild(events []fsnotify.Event) (bool, error) {
 
        jww.DEBUG.Printf("Rebuild for events %q", events)
 
@@ -555,7 +555,9 @@ func (s *Site) ReBuild(events []fsnotify.Event) (bool, error) {
                // Do not need to read the files again, but they need conversion
                // for shortocde re-rendering.
                for _, p := range s.rawAllPages {
-                       pageChan <- p
+                       if p.shouldBuild() {
+                               pageChan <- p
+                       }
                }
        }
 
@@ -1016,7 +1018,9 @@ func (s *Site) convertSource() chan error {
        go converterCollator(s, results, errs)
 
        for _, p := range s.rawAllPages {
-               pageChan <- p
+               if p.shouldBuild() {
+                       pageChan <- p
+               }
        }
 
        for _, f := range s.Files {