Mercurial > piecrust2

comparison piecrust/sources/autoconfig.py @ 1085:3d71cd95f90a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sources: Fix index page slug for ordered page source.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 15 Feb 2018 22:27:11 -0800
parents 75f1b4460491
children
comparison
equal deleted inserted replaced
1084:e135fd873c45 1085:3d71cd95f90a
101 101
102 for dirpath, dirnames, filenames in os.walk(self.fs_endpoint_path): 102 for dirpath, dirnames, filenames in os.walk(self.fs_endpoint_path):
103 for f in filenames: 103 for f in filenames:
104 slug, _ = os.path.splitext(f) 104 slug, _ = os.path.splitext(f)
105 if slug == route_slug: 105 if slug == route_slug:
106 path = os.path.join(dirpath, f)
106 metadata = self._createItemMetadata(path) 107 metadata = self._createItemMetadata(path)
107 path = os.path.join(dirpath, f) 108 path = os.path.join(dirpath, f)
108 rel_path = os.path.relpath(path, self.fs_endpoint_path) 109 rel_path = os.path.relpath(path, self.fs_endpoint_path)
109 config = self._extractConfigFragment(rel_path) 110 config = self._extractConfigFragment(rel_path)
110 metadata.setdefault('config', {}).update(config) 111 metadata.setdefault('config', {}).update(config)
201 self.setting_name: values[-1], 202 self.setting_name: values[-1],
202 self.setting_name + '_trail': values} 203 self.setting_name + '_trail': values}
203 204
204 def _makeSlug(self, path): 205 def _makeSlug(self, path):
205 slug = super()._makeSlug(path) 206 slug = super()._makeSlug(path)
206 return self.re_pattern.sub(r'\1', slug) 207 slug = self.re_pattern.sub(r'\1', slug)
208 if slug == '_index':
209 slug = ''
210 return slug
207 211
208 212
209 class OrderTrailSortIterator(object): 213 class OrderTrailSortIterator(object):
210 def __init__(self, it, trail_name, value_accessor): 214 def __init__(self, it, trail_name, value_accessor):
211 self.it = it 215 self.it = it