shithub: hugo

Download patch

ref: 8db3c0b0a677a6b122ad5a396ee52b074acb7e87
parent: b4c507287a67d806832893029648219d5830fd7d
author: spf13 <[email protected]>
date: Fri Jan 30 07:05:05 EST 2015 

page rendering and writing using BBP


--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -837,11 +837,9 @@
 			layouts = append(layouts, "_default/single.html")
 		}
 
-		b, err := s.renderPage("page "+p.FullFilePath(), p, s.appendThemeTemplates(layouts)...)
+		err := s.renderAndWritePage("page "+p.FullFilePath(), p.TargetPath(), p, s.appendThemeTemplates(layouts)...)
 		if err != nil {
 			results <- err
-		} else {
-			results <- s.WriteDestPage(p.TargetPath(), b)
 		}
 	}
 }
@@ -963,18 +961,11 @@
 
 		n, base = s.newTaxonomyNode(t)
 
-		b, err := s.renderPage("taxononomy "+t.singular, n, layouts...)
-		if err != nil {
+		if err := s.renderAndWritePage("taxononomy "+t.singular, base, n, layouts...); err != nil {
 			results <- err
 			continue
 		}
 
-		err = s.WriteDestPage(base, b)
-		if err != nil {
-			results <- err
-			continue
-		}
-
 		if n.paginator != nil {
 
 			paginatePath := viper.GetString("paginatePath")
@@ -997,18 +988,10 @@
 				}
 				pageNumber := i + 1
 				htmlBase := fmt.Sprintf("/%s/%s/%d", base, paginatePath, pageNumber)
-				b, err := s.renderPage(fmt.Sprintf("taxononomy_%s_%d", t.singular, pageNumber), taxonomyPagerNode, layouts...)
-				if err != nil {
+				if err := s.renderAndWritePage(fmt.Sprintf("taxononomy_%s_%d", t.singular, pageNumber), htmlBase, taxonomyPagerNode, layouts...); err != nil {
 					results <- err
 					continue
 				}
-
-				err = s.WriteDestPage(htmlBase, b)
-				if err != nil {
-					results <- err
-					continue
-				}
-
 			}
 		}
 
@@ -1042,13 +1025,9 @@
 		layouts := []string{"taxonomy/" + singular + ".terms.html", "_default/terms.html", "indexes/indexes.html"}
 		layouts = s.appendThemeTemplates(layouts)
 		if s.layoutExists(layouts...) {
-			b, err := s.renderPage("taxonomy terms for "+singular, n, layouts...)
-			if err != nil {
+			if err := s.renderAndWritePage("taxonomy terms for "+singular, plural+"/index.html", n, layouts...); err != nil {
 				return err
 			}
-			if err := s.WriteDestPage(plural+"/index.html", b); err != nil {
-				return err
-			}
 		}
 	}
 
@@ -1078,13 +1057,9 @@
 
 		n := s.newSectionListNode(section, data)
 
-		b, err := s.renderPage(fmt.Sprintf("section%s_%d", section, 1), n, s.appendThemeTemplates(layouts)...)
-		if err != nil {
+		if err := s.renderAndWritePage(fmt.Sprintf("section%s_%d", section, 1), fmt.Sprintf("/%s", section), n, s.appendThemeTemplates(layouts)...); err != nil {
 			return err
 		}
-		if err := s.WriteDestPage(fmt.Sprintf("/%s", section), b); err != nil {
-			return err
-		}
 
 		if n.paginator != nil {
 
@@ -1108,14 +1083,9 @@
 				}
 				pageNumber := i + 1
 				htmlBase := fmt.Sprintf("/%s/%s/%d", section, paginatePath, pageNumber)
-				b, err := s.renderPage(fmt.Sprintf("section_%s_%d", section, pageNumber), sectionPagerNode, layouts...)
-				if err != nil {
+				if err := s.renderAndWritePage(fmt.Sprintf("section_%s_%d", section, pageNumber), filepath.FromSlash(htmlBase), sectionPagerNode, layouts...); err != nil {
 					return err
 				}
-				if err := s.WriteDestPage(filepath.FromSlash(htmlBase), b); err != nil {
-					return err
-				}
-
 			}
 		}
 
@@ -1144,14 +1114,9 @@
 	n := s.newHomeNode()
 	layouts := s.appendThemeTemplates([]string{"index.html", "_default/list.html", "_default/single.html"})
 
-	b, err := s.renderPage("homepage", n, layouts...)
-
-	if err != nil {
+	if err := s.renderAndWritePage("homepage", "/", n, layouts...); err != nil {
 		return err
 	}
-	if err := s.WriteDestPage("/", b); err != nil {
-		return err
-	}
 
 	if n.paginator != nil {
 
@@ -1175,14 +1140,9 @@
 			}
 			pageNumber := i + 1
 			htmlBase := fmt.Sprintf("/%s/%d", paginatePath, pageNumber)
-			b, err := s.renderPage(fmt.Sprintf("homepage_%d", pageNumber), homePagerNode, layouts...)
-			if err != nil {
+			if err := s.renderAndWritePage(fmt.Sprintf("homepage_%d", pageNumber), filepath.FromSlash(htmlBase), homePagerNode, layouts...); err != nil {
 				return err
 			}
-			if err := s.WriteDestPage(filepath.FromSlash(htmlBase), b); err != nil {
-				return err
-			}
-
 		}
 	}
 
@@ -1211,13 +1171,9 @@
 	n.Permalink = s.permalink("404.html")
 
 	nfLayouts := []string{"404.html"}
-	b, nfErr := s.renderPage("404 page", n, s.appendThemeTemplates(nfLayouts)...)
-	if nfErr != nil {
+	if nfErr := s.renderAndWritePage("404 page", "404.html", n, s.appendThemeTemplates(nfLayouts)...); nfErr != nil {
 		return nfErr
 	}
-	if err := s.WriteDestFile("404.html", b); err != nil {
-		return err
-	}
 
 	return nil
 }
@@ -1340,11 +1296,14 @@
 	return err
 }
 
-func (s *Site) renderPage(name string, d interface{}, layouts ...string) (io.Reader, error) {
-	renderBuffer := new(bytes.Buffer)
+func (s *Site) renderAndWritePage(name string, dest string, d interface{}, layouts ...string) error {
+	renderBuffer := bp.GetBuffer()
+	defer bp.PutBuffer(renderBuffer)
+
 	err := s.render(name, d, renderBuffer, layouts...)
 
-	var outBuffer = new(bytes.Buffer)
+	outBuffer := bp.GetBuffer()
+	defer bp.PutBuffer(outBuffer)
 
 	transformLinks := transform.NewEmptyTransforms()
 
@@ -1351,7 +1310,7 @@
 	if viper.GetBool("CanonifyUrls") {
 		absURL, err := transform.AbsURL(viper.GetString("BaseUrl"))
 		if err != nil {
-			return nil, err
+			return err
 		}
 		transformLinks = append(transformLinks, absURL...)
 	}
@@ -1362,7 +1321,13 @@
 
 	transformer := transform.NewChain(transformLinks...)
 	transformer.Apply(outBuffer, renderBuffer)
-	return outBuffer, err
+
+	if err == nil {
+		if err = s.WriteDestPage(dest, outBuffer); err != nil {
+			return err
+		}
+	}
+	return err
 }
 
 func (s *Site) render(name string, d interface{}, renderBuffer *bytes.Buffer, layouts ...string) error {