Mercurial > piecrust2
changeset 147:ab6e7e0e9d44
Pass date information to routing when building URLs.
This is so that URLs with dates in them can be built even when the date
information is not coming from the source metadata, but from the page's
config.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sat, 29 Nov 2014 21:00:44 -0800 |
| parents | 0609739169bd |
| children | 432cd534ce08 |
| files | piecrust/baking/baker.py piecrust/data/base.py piecrust/page.py piecrust/processing/sitemap.py piecrust/routing.py |
| diffstat | 5 files changed, 27 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/baking/baker.py Sat Nov 29 20:58:28 2014 -0800 +++ b/piecrust/baking/baker.py Sat Nov 29 21:00:44 2014 -0800 @@ -84,8 +84,9 @@ def bake(self, factory, route, record_entry, taxonomy_name=None, taxonomy_term=None): + custom_data = None pagination_filter = None - custom_data = None + route_metadata = dict(factory.metadata) if taxonomy_name and taxonomy_term: # Must bake a taxonomy listing page... we'll have to add a # pagination filter for only get matching posts, and the output @@ -108,10 +109,11 @@ taxonomy_term)) slugified_term = taxonomy_term custom_data = {tax.term_name: taxonomy_term} - uri = route.getUri({tax.term_name: slugified_term}) - else: - # Normal page bake. - uri = route.getUri(factory.metadata) + route_metadata.update({tax.term_name: slugified_term}) + + # Generate the URL using the route. + page = factory.buildPage() + uri = route.getUri(route_metadata, page) override = self.record.getOverrideEntry(factory, uri) if override is not None: @@ -131,7 +133,6 @@ has_more_subs = True force_this = self.force invalidate_formatting = False - page = factory.buildPage() record_entry.config = page.config.get().copy() prev_record_entry = self.record.getPreviousEntry( factory.source.name, factory.rel_path,
--- a/piecrust/data/base.py Sat Nov 29 20:58:28 2014 -0800 +++ b/piecrust/data/base.py Sat Nov 29 21:00:44 2014 -0800 @@ -123,7 +123,7 @@ route = page.app.getRoute(page.source.name, page.source_metadata) if route is None: raise Exception("Can't get route for page: %s" % page.path) - return route.getUri(page.source_metadata) + return route.getUri(page.source_metadata, page) def _loadCustom(self): page_url = self._get_uri()
--- a/piecrust/page.py Sat Nov 29 20:58:28 2014 -0800 +++ b/piecrust/page.py Sat Nov 29 21:00:44 2014 -0800 @@ -11,6 +11,7 @@ from werkzeug.utils import cached_property from piecrust.configuration import (Configuration, ConfigurationError, parse_config_header) +from piecrust.routing import IRouteMetadataProvider logger = logging.getLogger(__name__) @@ -36,7 +37,7 @@ FLAG_RAW_CACHE_VALID = 2**0 -class Page(object): +class Page(IRouteMetadataProvider): def __init__(self, source, source_metadata, rel_path): self.source = source self.source_metadata = source_metadata @@ -137,6 +138,13 @@ if was_cache_valid: self._flags |= FLAG_RAW_CACHE_VALID + def getRouteMetadata(self): + page_dt = self.datetime + return { + 'year': page_dt.year, + 'month': page_dt.month, + 'day': page_dt.day} + def _parse_config_date(page_date): if page_date is None:
--- a/piecrust/processing/sitemap.py Sat Nov 29 20:58:28 2014 -0800 +++ b/piecrust/processing/sitemap.py Sat Nov 29 21:00:44 2014 -0800 @@ -67,7 +67,7 @@ for page in source.getPages(): route = self.app.getRoute(source.name, page.source_metadata) - uri = route.getUri(page.source_metadata) + uri = route.getUri(page.source_metadata, page) t = page.datetime.timestamp() sm_cfg = page.config.get('sitemap')
--- a/piecrust/routing.py Sat Nov 29 20:58:28 2014 -0800 +++ b/piecrust/routing.py Sat Nov 29 21:00:44 2014 -0800 @@ -10,6 +10,11 @@ template_func_arg_re = re.compile(r',\s*(?P<arg>\w+)') +class IRouteMetadataProvider(object): + def getRouteMetadata(self): + raise NotImplementedError() + + class Route(object): """ Information about a route for a PieCrust application. Each route defines the "shape" of an URL and how it maps to @@ -48,7 +53,10 @@ def isMatch(self, source_metadata): return True - def getUri(self, source_metadata): + def getUri(self, source_metadata, provider=None): + if provider: + source_metadata = dict(source_metadata) + source_metadata.update(provider.getRouteMetadata()) #TODO: fix this hard-coded shit for key in ['year', 'month', 'day']: if key in source_metadata and isinstance(source_metadata[key], str):