github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a bug that ArticlesGenerator doesn't see DEFAULT_CATEGORY.

Browse source 
When you set ARTICLE_DIR which is not equal to PATH, ArticlesGenerator
doesn't use DEFAULT_CATEGORY but use ARTICLE_DIR's dirname.
This commit is contained in:
draftcode 2012-03-16 15:04:06 +09:00
commit 4efca13c33
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pelican/generators.py
View file

@ -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))\