From 953b6616a2adb186e9461c6b5a351363ae3ff15b Mon Sep 17 00:00:00 2001 From: "Martin (mart-e)" Date: Sat, 6 May 2023 08:40:29 +0200 Subject: [PATCH] Don't spcify unlimited feed size by default Having a feed with hundreds of articles, making a very large file, is rarely expected. Set a high fallback value of 100 so it does not change for small sites. Still allow to have infinite feed by setting FEED_MAX_ITEM = None --- docs/settings.rst | 6 +++--- pelican/settings.py | 2 +- pelican/writers.py | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index e51c6a1207..0c0353a33e 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -998,10 +998,10 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings: placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location and URL. -.. data:: FEED_MAX_ITEMS +.. data:: FEED_MAX_ITEMS = 100 - Maximum number of items allowed in a feed. Feed item quantity is - unrestricted by default. + Maximum number of items allowed in a feed. Setting to ``None`` will cause the + feed to contains every article. 100 if not specified. .. data:: RSS_FEED_SUMMARY_ONLY = True diff --git a/pelican/settings.py b/pelican/settings.py index 5b495e863a..f38b46f01f 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -40,7 +40,7 @@ def load_source(name, path): 'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml', 'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml', 'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml', - 'FEED_MAX_ITEMS': '', + 'FEED_MAX_ITEMS': 100, 'RSS_FEED_SUMMARY_ONLY': True, 'SITEURL': '', 'SITENAME': 'A Pelican Blog', diff --git a/pelican/writers.py b/pelican/writers.py index 73ee4b3331..f028026999 100644 --- a/pelican/writers.py +++ b/pelican/writers.py @@ -143,11 +143,9 @@ def write_feed(self, elements, context, path=None, url=None, feed = self._create_new_feed(feed_type, feed_title, context) - max_items = len(elements) - if self.settings['FEED_MAX_ITEMS']: - max_items = min(self.settings['FEED_MAX_ITEMS'], max_items) - for i in range(max_items): - self._add_item_to_the_feed(feed, elements[i]) + # FEED_MAX_ITEMS = None means [:None] to get every element + for element in elements[:self.settings['FEED_MAX_ITEMS']]: + self._add_item_to_the_feed(feed, element) signals.feed_generated.send(context, feed=feed) if path: