Mercurial > piecrust2

comparison piecrust/data/provider.py @ 369:4b1019bb2533

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 50da3a045d59
children fd8e39254da0
comparison
equal deleted inserted replaced
368:2408eb6f4da8 369:4b1019bb2533
32 if self._user_data: 32 if self._user_data:
33 return list(self._user_data.keys()) 33 return list(self._user_data.keys())
34 return [] 34 return []
35 35
36 36
37 class CompositeDataProvider(object):
38 def __init__(self, providers):
39 self._providers = providers
40
41 def __getattr__(self, name):
42 for p in self._providers:
43 try:
44 return getattr(p, name)
45 except AttributeError:
46 pass
47 raise AttributeError()
48
49
50 class IteratorDataProvider(DataProvider): 37 class IteratorDataProvider(DataProvider):
51 PROVIDER_NAME = 'iterator' 38 PROVIDER_NAME = 'iterator'
52 39
53 debug_render_doc = """Provides a list of pages.""" 40 debug_render_doc = """Provides a list of pages."""
54 41
55 def __init__(self, source, page, user_data): 42 def __init__(self, source, page, user_data):
43 self._innerIt = None
44 if isinstance(user_data, IteratorDataProvider):
45 # Iterator providers can be chained, like for instance with
46 # `site.pages` listing both the theme pages and the user site's
47 # pages.
48 self._innerIt = user_data
49 user_data = None
50
56 super(IteratorDataProvider, self).__init__(source, page, user_data) 51 super(IteratorDataProvider, self).__init__(source, page, user_data)
57 self._pages = PageIterator(source, current_page=page) 52 self._pages = PageIterator(source, current_page=page)
58 self._pages._iter_event += self._onIteration 53 self._pages._iter_event += self._onIteration
59 self._ctx_set = False 54 self._ctx_set = False
60 55
63 58
64 def __getitem__(self, key): 59 def __getitem__(self, key):
65 return self._pages[key] 60 return self._pages[key]
66 61
67 def __iter__(self): 62 def __iter__(self):
68 return iter(self._pages) 63 yield from iter(self._pages)
64 if self._innerIt:
65 yield from self._innerIt
69 66
70 def _onIteration(self): 67 def _onIteration(self):
71 if not self._ctx_set: 68 if not self._ctx_set:
72 eis = self._page.app.env.exec_info_stack 69 eis = self._page.app.env.exec_info_stack
73 eis.current_page_info.render_ctx.addUsedSource(self._source.name) 70 eis.current_page_info.render_ctx.addUsedSource(self._source.name)