weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Merge pull request #2758 from MinchinWeb/settings-pathlib-2

Browse source
This commit is contained in:
Justin Mayer 2023-10-28 21:56:34 +02:00 • committed by GitHub
commit e14f20bb99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 75 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

67
pelican/generators.py
View file

@ -18,7 +18,6 @@ from pelican.readers import Readers
from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
posixize_path, process_translations)
logger = logging.getLogger(__name__)
@ -328,8 +327,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(
@ -355,12 +355,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
str(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
)
@ -368,12 +368,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
str(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,
feed_type='rss'
)
@ -383,11 +383,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
str(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
)
@ -395,11 +396,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
str(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'
)
@ -411,11 +413,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
str(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
)
@ -423,11 +426,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
str(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,25 +449,30 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_ATOM']
.format(lang=lang),
str(
self.settings['TRANSLATION_FEED_ATOM']
).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'):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_RSS']
.format(lang=lang),
str(
self.settings['TRANSLATION_FEED_RSS']
).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'
)
)
def generate_articles(self, write):
"""Generate the articles."""