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

Feeds - Update generators.py to fix a bug with slugs in {category,tag,author,lang} feeds link

Browse source 
In the feeds XML output, specifically for category, tag, author and lang feeds, part "{slug}" of the URL was not formatted in feeds link (line: <link href="...{slug}..." rel="self"/>) as soon as a _URL parameter (like CATEGORY_FEED_ATOM_URL) was given in the settings.

This commit will fix that, applying the format(slug) in all cases, whether _URL parameter is given or not.
This commit is contained in:
nam-ori 2024-01-21 23:16:54 +01:00 • committed by GitHub
commit cba7b2c080
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
pelican/generators.py
View file

@ -382,10 +382,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
self.settings.get(
str(self.settings.get(
"CATEGORY_FEED_ATOM_URL",
str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
),
self.settings["CATEGORY_FEED_ATOM"])
).format(slug=cat.slug),
feed_title=cat.name,
)
@ -394,10 +394,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
self.settings.get(
str(self.settings.get(
"CATEGORY_FEED_RSS_URL",
str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
),
self.settings["CATEGORY_FEED_RSS"])
).format(slug=cat.slug),
feed_title=cat.name,
feed_type="rss",
)
@ -408,10 +408,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
self.settings.get(
str(self.settings.get(
"AUTHOR_FEED_ATOM_URL",
str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
),
self.settings["AUTHOR_FEED_ATOM"])
).format(slug=auth.slug),
feed_title=auth.name,
)
@ -420,10 +420,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
self.settings.get(
str(self.settings.get(
"AUTHOR_FEED_RSS_URL",
str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
),
self.settings["AUTHOR_FEED_RSS"])
).format(slug=auth.slug),
feed_title=auth.name,
feed_type="rss",
)
@ -435,10 +435,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
self.settings.get(
str(self.settings.get(
"TAG_FEED_ATOM_URL",
str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
),
self.settings["TAG_FEED_ATOM"])
).format(slug=tag.slug),
feed_title=tag.name,
)
@ -447,10 +447,10 @@ class ArticlesGenerator(CachingGenerator):
arts,
self.context,
str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
self.settings.get(
str(self.settings.get(
"TAG_FEED_RSS_URL",
str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
),
self.settings["TAG_FEED_RSS"])
).format(slug=tag.slug),
feed_title=tag.name,
feed_type="rss",
)
@ -469,21 +469,19 @@ class ArticlesGenerator(CachingGenerator):
items,
self.context,
str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang),
self.settings.get(
str(self.settings.get(
"TRANSLATION_FEED_ATOM_URL",
str(self.settings["TRANSLATION_FEED_ATOM"]).format(
lang=lang
),
),
self.settings["TRANSLATION_FEED_ATOM"])
).format(lang=lang),
)
if self.settings.get("TRANSLATION_FEED_RSS"):
writer.write_feed(
items,
self.context,
str(self.settings["TRANSLATION_FEED_RSS"]).format(lang=lang),
self.settings.get(
str(self.settings.get(
"TRANSLATION_FEED_RSS_URL",
str(self.settings["TRANSLATION_FEED_RSS"]),
self.settings["TRANSLATION_FEED_RSS"])
).format(lang=lang),
feed_type="rss",
)