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

Allow generators to deal with settings that are pathlib.Paths

Browse source
This commit is contained in:
MinchinWeb 2020-04-23 12:49:44 -06:00
commit d28bc82d56
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pelican/generators.py
View file

@ -20,7 +20,6 @@ from pelican.readers import Readers
from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
posixize_path, process_translations)
logger = logging.getLogger(__name__)
@ -324,8 +323,9 @@ class ArticlesGenerator(CachingGenerator):
all_articles = list(self.articles)
for article in self.articles:
all_articles.extend(article.translations)
order_content(all_articles,
order_by=self.settings['ARTICLE_ORDER_BY'])
order_content(
all_articles, order_by=self.settings['ARTICLE_ORDER_BY']
)
if self.settings.get('FEED_ALL_ATOM'):
writer.write_feed(
@ -354,7 +354,7 @@ class ArticlesGenerator(CachingGenerator):
self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_ATOM_URL',
self.settings['CATEGORY_FEED_ATOM']).format(
str(self.settings['CATEGORY_FEED_ATOM'])).format(
slug=cat.slug
),
feed_title=cat.name
@ -367,7 +367,7 @@ class ArticlesGenerator(CachingGenerator):
self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_RSS_URL',
self.settings['CATEGORY_FEED_RSS']).format(
str(self.settings['CATEGORY_FEED_RSS'])).format(
slug=cat.slug
),
feed_title=cat.name,
@ -382,8 +382,9 @@ class ArticlesGenerator(CachingGenerator):
self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_ATOM_URL',
self.settings['AUTHOR_FEED_ATOM']
).format(slug=auth.slug),
str(self.settings['AUTHOR_FEED_ATOM'])).format(
slug=auth.slug
),
feed_title=auth.name
)
@ -394,8 +395,9 @@ class ArticlesGenerator(CachingGenerator):
self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_RSS_URL',
self.settings['AUTHOR_FEED_RSS']
).format(slug=auth.slug),
str(self.settings['AUTHOR_FEED_RSS'])).format(
slug=auth.slug
),
feed_title=auth.name,
feed_type='rss'
)
@ -410,8 +412,9 @@ class ArticlesGenerator(CachingGenerator):
self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
self.settings.get(
'TAG_FEED_ATOM_URL',
self.settings['TAG_FEED_ATOM']
).format(slug=tag.slug),
str(self.settings['TAG_FEED_ATOM'])).format(
slug=tag.slug
),
feed_title=tag.name
)
@ -422,8 +425,9 @@ class ArticlesGenerator(CachingGenerator):
self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
self.settings.get(
'TAG_FEED_RSS_URL',
self.settings['TAG_FEED_RSS']
).format(slug=tag.slug),
str(self.settings['TAG_FEED_RSS'])).format(
slug=tag.slug
),
feed_title=tag.name,
feed_type='rss'
)
@ -445,7 +449,8 @@ class ArticlesGenerator(CachingGenerator):
.format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_ATOM_URL',
self.settings['TRANSLATION_FEED_ATOM']
str(
self.settings['TRANSLATION_FEED_ATOM'])
).format(lang=lang),
)
if self.settings.get('TRANSLATION_FEED_RSS'):
@ -456,8 +461,9 @@ class ArticlesGenerator(CachingGenerator):
.format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_RSS_URL',
self.settings['TRANSLATION_FEED_RSS']
).format(lang=lang),
str(self.settings['TRANSLATION_FEED_RSS'])).format(
lang=lang
),
feed_type='rss'
)