Pages from data

Fixes gohugoio#6310
bep · Sep 9, 2019 · 02ce512 · 02ce512
1 parent 77b23fe
commit 02ce512
Show file tree

Hide file tree

Showing 15 changed files with 585 additions and 228 deletions.
diff --git a/common/hugio/readers.go b/common/hugio/readers.go
@@ -52,3 +52,28 @@ func NewReadSeekerNoOpCloser(r ReadSeeker) ReadSeekerNoOpCloser {
 func NewReadSeekerNoOpCloserFromString(content string) ReadSeekerNoOpCloser {
 	return ReadSeekerNoOpCloser{strings.NewReader(content)}
 }
+
+type multiReadCloser struct {
+	io.Reader
+	closers []io.ReadCloser
+}
+
+func (m multiReadCloser) Close() error {
+	var err error
+	for _, c := range m.closers {
+		if closeErr := c.Close(); err != nil {
+			err = closeErr
+		}
+	}
+	return err
+}
+
+// NewMultiReadCloser returns a io.ReadCloser that's the logical concatenation of
+// the provided input readers.
+func NewMultiReadCloser(readClosers ...io.ReadCloser) io.ReadCloser {
+	readers := make([]io.Reader, len(readClosers))
+	for i, r := range readClosers {
+		readers[i] = r
+	}
+	return multiReadCloser{Reader: io.MultiReader(readers...), closers: readClosers}
+}
diff --git a/go.mod b/go.mod
@@ -51,9 +51,11 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
+	github.com/starlight-go/starlight v0.0.0-20181207205707-b06f321544f3
 	github.com/tdewolff/minify/v2 v2.3.7
 	github.com/yosssi/ace v0.0.5
 	go.opencensus.io v0.22.0 // indirect
+	go.starlark.net v0.0.0-20190820173200-988906f77f65
 	gocloud.dev v0.15.0
 	golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff
 	golang.org/x/net v0.0.0-20190606173856-1492cefac77f // indirect

diff --git a/go.sum b/go.sum
@@ -297,6 +297,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
+github.com/starlight-go/starlight v0.0.0-20181207205707-b06f321544f3 h1:/fBh1Ot84ILt/ociFHO98wJ9LxIMA3UG8B0unUJPFpY=
+github.com/starlight-go/starlight v0.0.0-20181207205707-b06f321544f3/go.mod h1:pxOc2ZuBV+CNlQgzq/HJ9Z9G/eoEMHFeuGohOvva4Co=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -334,6 +336,8 @@ go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.starlark.net v0.0.0-20190820173200-988906f77f65 h1:0766L84ADcyJQKl+NsKSJC8JBEuer/2RxL37StWfsx4=
+go.starlark.net v0.0.0-20190820173200-988906f77f65/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=

diff --git a/hugofs/files/classifier.go b/hugofs/files/classifier.go
@@ -52,11 +52,16 @@ func IsContentExt(ext string) bool {
 const (
 	ContentClassLeaf    = "leaf"
 	ContentClassBranch  = "branch"
+	ContentClassPlugin    = "data"
 	ContentClassFile    = "zfile" // Sort below
 	ContentClassContent = "zcontent"
 )
 
 func ClassifyContentFile(filename string) string {
+	if strings.HasPrefix(filename, "_content.py") {
+		return ContentClassPlugin
+	}
+
 	if !IsContentFile(filename) {
 		return ContentClassFile
 	}

diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
@@ -258,19 +258,15 @@ func (p *pageMeta) Section() string {
 		return ""
 	}
 
-	if p.IsNode() {
-		if len(p.sections) == 0 {
-			// May be a sitemap or similar.
-			return ""
-		}
-		return p.sections[0]
-	}
-
-	if !p.File().IsZero() {
+	if p.IsPage() && !p.File().IsZero() {
 		return p.File().Section()
 	}
 
-	panic("invalid page state")
+	if len(p.sections) == 0 {
+		// May be a sitemap or similar.
+		return ""
+	}
+	return p.sections[0]
 
 }