From cba7b2c08053f4c6affd556f746443ee325d04b6 Mon Sep 17 00:00:00 2001 From: nam-ori <157323136+nam-ori@users.noreply.github.com> Date: Sun, 21 Jan 2024 23:16:54 +0100 Subject: [PATCH] Feeds - Update generators.py to fix a bug with slugs in {category,tag,author,lang} feeds link 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: ) 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. --- pelican/generators.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index 3b5ca9e4..68f759f4 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -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", )