Mercurial > piecrust2

changeset 248:3f740928043a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sources: The ordered source returns names without prefixes in `listPath`.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 19 Feb 2015 23:34:53 -0800
parents d9d5c5de02a8
children f1e8ed3ea141 311447fe3dd0
files piecrust/sources/autoconfig.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/sources/autoconfig.py	Thu Feb 19 23:33:54 2015 -0800
+++ b/piecrust/sources/autoconfig.py	Thu Feb 19 23:34:53 2015 -0800
@@ -254,10 +254,12 @@
         items = []
         names = sorted(os.listdir(path))
         for name in names:
+            clean_name = self.re_pattern.sub('', name)
+            clean_name, _ = os.path.splitext(clean_name)
             if os.path.isdir(os.path.join(path, name)):
                 if filter_page_dirname(name):
                     rel_subdir = os.path.join(rel_path, name)
-                    items.append((True, name, rel_subdir))
+                    items.append((True, clean_name, rel_subdir))
             else:
                 if filter_page_filename(name):
                     slug = self._makeSlug(os.path.join(rel_path, name))
@@ -272,7 +274,7 @@
                     fac = PageFactory(self, fac_path, metadata)
 
                     name, _ = os.path.splitext(name)
-                    items.append((False, name, fac))
+                    items.append((False, clean_name, fac))
         return items
 
     def _makeSlug(self, rel_path):