Mercurial > piecrust2
changeset 235:55087da9a72e
bake: Don't include the site root when building output paths.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sat, 14 Feb 2015 08:49:09 -0800 |
| parents | 1c4078ec3011 |
| children | eaf18442bff8 |
| files | piecrust/baking/single.py piecrust/routing.py |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/baking/single.py Sat Feb 14 08:37:00 2015 -0800 +++ b/piecrust/baking/single.py Sat Feb 14 08:49:09 2015 -0800 @@ -109,7 +109,7 @@ # Generate the URL using the route. page = factory.buildPage() - uri = route.getUri(route_metadata, page) + uri = route.getUri(route_metadata, page, include_site_root=False) override = self.record.getOverrideEntry(factory, uri) if override is not None:
--- a/piecrust/routing.py Sat Feb 14 08:37:00 2015 -0800 +++ b/piecrust/routing.py Sat Feb 14 08:49:09 2015 -0800 @@ -85,7 +85,7 @@ return m.groupdict() return None - def getUri(self, source_metadata, provider=None): + def getUri(self, source_metadata, provider=None, include_site_root=True): if provider: source_metadata = dict(source_metadata) source_metadata.update(provider.getRouteMetadata()) @@ -93,7 +93,10 @@ for key in ['year', 'month', 'day']: if key in source_metadata and isinstance(source_metadata[key], str): source_metadata[key] = int(source_metadata[key]) - return self.uri_root + (self.uri_format % source_metadata) + uri = self.uri_format % source_metadata + if include_site_root: + uri = self.uri_root + uri + return uri def _uriFormatRepl(self, m): name = m.group('name')