Mercurial > piecrust2
comparison piecrust/data/paginator.py @ 369:4b1019bb2533
serve: Giant refactor to change how we handle data when serving pages.
* We need a distinction between source metadata and route metadata. In most
cases they're the same, but in cases like taxonomy pages, route metadata
contains more things that can't be in source metadata if we want to re-use
cached pages.
* Create a new `QualifiedPage` type which is a page with a specific route
and route metadata. Pass this around in many places.
* Instead of passing an URL around, use the route in the `QualifiedPage` to
generate URLs. This is better since it removes the guess-work from trying
to generate URLs for sub-pages.
* Deep-copy app and page configurations before passing them around to things
that could modify them, like data builders and such.
* Exclude taxonomy pages from iterator data providers.
* Properly nest iterator data providers for when the theme and user page
sources are merged inside `site.pages`.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sun, 03 May 2015 18:47:10 -0700 |
parents | 498a917cd2d4 |
children | 89c1e2a91468 |
comparison
equal
deleted
inserted
replaced
368:2408eb6f4da8 | 369:4b1019bb2533 |
---|---|
21 'items_this_page', 'prev_page_number', 'this_page_number', | 21 'items_this_page', 'prev_page_number', 'this_page_number', |
22 'next_page_number', 'prev_page', 'next_page', | 22 'next_page_number', 'prev_page', 'next_page', |
23 'total_item_count', 'total_page_count', | 23 'total_item_count', 'total_page_count', |
24 'next_item', 'prev_item'] | 24 'next_item', 'prev_item'] |
25 | 25 |
26 def __init__(self, page, source, page_num=1, pgn_filter=None, | 26 def __init__(self, qualified_page, source, *, |
27 items_per_page=-1): | 27 page_num=1, pgn_filter=None, items_per_page=-1): |
28 self._parent_page = page | 28 self._parent_page = qualified_page |
29 self._source = source | 29 self._source = source |
30 self._page_num = page_num | 30 self._page_num = page_num |
31 self._route = None | |
32 self._iterator = None | 31 self._iterator = None |
33 self._pgn_filter = pgn_filter | 32 self._pgn_filter = pgn_filter |
34 self._items_per_page = items_per_page | 33 self._items_per_page = items_per_page |
35 self._pgn_set_on_ctx = False | 34 self._pgn_set_on_ctx = False |
36 | 35 |
212 f.addClause(sf.root_clause) | 211 f.addClause(sf.root_clause) |
213 | 212 |
214 return f | 213 return f |
215 | 214 |
216 def _getPageUri(self, index): | 215 def _getPageUri(self, index): |
217 if self._route is None: | 216 return self._parent_page.getUri(index) |
218 app = self._source.app | |
219 self._route = app.getRoute(self._parent_page.source.name, | |
220 self._parent_page.source_metadata) | |
221 if self._route is None: | |
222 raise Exception("Can't get route for page: %s" % | |
223 self._parent_page.path) | |
224 | |
225 return self._route.getUri(self._parent_page.source_metadata, | |
226 provider=self._parent_page, | |
227 sub_num=index) | |
228 | 217 |
229 def _onIteration(self): | 218 def _onIteration(self): |
230 if self._parent_page is not None and not self._pgn_set_on_ctx: | 219 if self._parent_page is not None and not self._pgn_set_on_ctx: |
231 eis = self._parent_page.app.env.exec_info_stack | 220 eis = self._parent_page.app.env.exec_info_stack |
232 eis.current_page_info.render_ctx.setPagination(self) | 221 eis.current_page_info.render_ctx.setPagination(self) |