From 4efca13c33b8bf122cc56d78478f49557ab52fff Mon Sep 17 00:00:00 2001 From: draftcode Date: Fri, 16 Mar 2012 15:04:06 +0900 Subject: [PATCH] Fix a bug that ArticlesGenerator doesn't see DEFAULT_CATEGORY. When you set ARTICLE_DIR which is not equal to PATH, ArticlesGenerator doesn't use DEFAULT_CATEGORY but use ARTICLE_DIR's dirname. --- pelican/generators.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index 4e756213..d7ebb0b0 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -219,9 +219,10 @@ class ArticlesGenerator(Generator): def generate_context(self): """change the context""" + article_path = os.path.join(self.path, self.settings['ARTICLE_DIR']) all_articles = [] for f in self.get_files( - os.path.join(self.path, self.settings['ARTICLE_DIR']), + article_path, exclude=self.settings['ARTICLE_EXCLUDES']): try: content, metadata = read_file(f, settings=self.settings) @@ -232,7 +233,7 @@ class ArticlesGenerator(Generator): # if no category is set, use the name of the path as a category if 'category' not in metadata: - if os.path.dirname(f) == self.path: + if os.path.dirname(f) == article_path: category = self.settings['DEFAULT_CATEGORY'] else: category = os.path.basename(os.path.dirname(f))\