Mercurial > piecrust2

comparison piecrust/routing.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 bf32be298b89
children f33712c4cfab
comparison
equal deleted inserted replaced
368:2408eb6f4da8 369:4b1019bb2533
1 import re 1 import re
2 import os.path 2 import os.path
3 import copy
3 import logging 4 import logging
4 5
5 6
6 logger = logging.getLogger(__name__) 7 logger = logging.getLogger(__name__)
7 8
63 re.escape(uri_pattern_no_path)) + '$' 64 re.escape(uri_pattern_no_path)) + '$'
64 self.uri_re_no_path = re.compile(p) 65 self.uri_re_no_path = re.compile(p)
65 else: 66 else:
66 self.uri_re_no_path = None 67 self.uri_re_no_path = None
67 68
68 self.required_source_metadata = set() 69 self.required_route_metadata = set()
69 for m in route_re.finditer(self.uri_pattern): 70 for m in route_re.finditer(self.uri_pattern):
70 self.required_source_metadata.add(m.group('name')) 71 self.required_route_metadata.add(m.group('name'))
71 72
72 self.template_func = None 73 self.template_func = None
73 self.template_func_name = None 74 self.template_func_name = None
74 self.template_func_args = [] 75 self.template_func_args = []
75 self._createTemplateFunc(cfg.get('func')) 76 self._createTemplateFunc(cfg.get('func'))
84 85
85 @property 86 @property
86 def source_realm(self): 87 def source_realm(self):
87 return self.source.realm 88 return self.source.realm
88 89
89 def matchesMetadata(self, source_metadata): 90 def matchesMetadata(self, route_metadata):
90 return self.required_source_metadata.issubset(source_metadata.keys()) 91 return self.required_route_metadata.issubset(route_metadata.keys())
91 92
92 def matchUri(self, uri): 93 def matchUri(self, uri):
93 if not uri.startswith(self.uri_root): 94 if not uri.startswith(self.uri_root):
94 raise Exception("The given URI is not absolute: %s" % uri) 95 raise Exception("The given URI is not absolute: %s" % uri)
95 uri = uri[len(self.uri_root):] 96 uri = uri[len(self.uri_root):]
106 m = self.uri_re_no_path.match(uri) 107 m = self.uri_re_no_path.match(uri)
107 if m: 108 if m:
108 return m.groupdict() 109 return m.groupdict()
109 return None 110 return None
110 111
111 def getUri(self, source_metadata, *, sub_num=1, provider=None): 112 def getUri(self, route_metadata, *, sub_num=1, provider=None):
113 route_metadata = copy.deepcopy(route_metadata)
112 if provider: 114 if provider:
113 source_metadata = dict(source_metadata) 115 route_metadata.update(provider.getRouteMetadata())
114 source_metadata.update(provider.getRouteMetadata())
115 116
116 #TODO: fix this hard-coded shit 117 #TODO: fix this hard-coded shit
117 for key in ['year', 'month', 'day']: 118 for key in ['year', 'month', 'day']:
118 if key in source_metadata and isinstance(source_metadata[key], str): 119 if key in route_metadata and isinstance(route_metadata[key], str):
119 source_metadata[key] = int(source_metadata[key]) 120 route_metadata[key] = int(route_metadata[key])
120 121
121 uri = self.uri_format % source_metadata 122 uri = self.uri_format % route_metadata
122 suffix = None 123 suffix = None
123 if sub_num > 1: 124 if sub_num > 1:
124 # Note that we know the pagination suffix starts with a slash. 125 # Note that we know the pagination suffix starts with a slash.
125 suffix = self.pagination_suffix_format % {'num': sub_num} 126 suffix = self.pagination_suffix_format % {'num': sub_num}
126 127