Mercurial > piecrust2

diff piecrust/rendering.py @ 96:0445a2232de7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improvements and fixes to incremental baking. * Better handling of the render pass during page rendering. * Used sources are paired with the pass they were used in. * Proper use and invalidation of the rendered segments cache based on render passes. * The `Assetor` is also better tracking what was used in a page. * Add flags on a page to get better caching information for the debug window. * Property invalidation of the previous bake record when needed. * Better information about why pages are delayed.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 07 Sep 2014 23:48:57 -0700
parents 2fec3ee1298f
children 28444014ce7d
line wrap: on
line diff
--- a/piecrust/rendering.py	Sun Sep 07 21:37:10 2014 -0700
+++ b/piecrust/rendering.py	Sun Sep 07 23:48:57 2014 -0700
@@ -3,7 +3,6 @@
 import logging
 from piecrust.data.builder import (DataBuildingContext, build_page_data,
         build_layout_data)
-from piecrust.environment import PHASE_PAGE_FORMATTING, PHASE_PAGE_RENDERING
 from piecrust.sources.base import PageSource
 from piecrust.uriutil import get_slug
 
@@ -33,6 +32,11 @@
         return self.page.app
 
 
+PASS_NONE = 0
+PASS_FORMATTING = 1
+PASS_RENDERING = 2
+
+
 class PageRenderingContext(object):
     def __init__(self, page, uri, page_num=1):
         self.page = page
@@ -46,6 +50,7 @@
         self.used_pagination = None
         self.used_source_names = set()
         self.used_taxonomy_terms = set()
+        self.current_pass = PASS_NONE
 
     @property
     def app(self):
@@ -66,15 +71,16 @@
         if self.used_pagination is not None:
             raise Exception("Pagination has already been used.")
         self.used_pagination = paginator
+        self.addUsedSource(paginator._source)
 
     def addUsedSource(self, source):
         if isinstance(source, PageSource):
-            self.used_source_names.add(source.name)
+            self.used_source_names.add((source.name, self.current_pass))
 
 
 def render_page(ctx):
     eis = ctx.app.env.exec_info_stack
-    eis.pushPage(ctx.page, PHASE_PAGE_RENDERING, ctx)
+    eis.pushPage(ctx.page, ctx)
     try:
         page = ctx.page
 
@@ -87,6 +93,7 @@
             page_data.update(ctx.custom_data)
 
         # Render content segments.
+        ctx.current_pass = PASS_FORMATTING
         repo = ctx.app.env.rendered_segments_repository
         if repo:
             cache_key = '%s:%s' % (ctx.uri, ctx.page_num)
@@ -98,6 +105,7 @@
             contents = _do_render_page_segments(page, page_data)
 
         # Render layout.
+        ctx.current_pass = PASS_RENDERING
         layout_name = page.config.get('layout')
         if layout_name is None:
             layout_name = page.source.config.get('default_layout', 'default')
@@ -114,6 +122,7 @@
         rp.execution_info = eis.current_page_info
         return rp
     finally:
+        ctx.current_pass = PASS_NONE
         eis.popPage()
 
 
@@ -130,12 +139,14 @@
 
 def _do_render_page_segments_from_ctx(ctx):
     eis = ctx.app.env.exec_info_stack
-    eis.pushPage(ctx.page, PHASE_PAGE_FORMATTING, ctx)
+    eis.pushPage(ctx.page, ctx)
+    ctx.current_pass = PASS_FORMATTING
     try:
         data_ctx = DataBuildingContext(ctx.page, ctx.uri, ctx.page_num)
         page_data = build_page_data(data_ctx)
         return _do_render_page_segments(ctx.page, page_data)
     finally:
+        ctx.current_pass = PASS_NONE
         eis.popPage()