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

Dont use relative urls if SITEURL is set. Feeds needs absolutes urls

Browse source
This commit is contained in:
Philippe Pepiot 2010-12-01 02:30:38 +01:00
commit 7d11af5630
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pelican/generators.py
View file

@ -64,8 +64,7 @@ class Generator(object):
for p in processors: for p in processors:
p.process(context, self) p.process(context, self)
def generate_feed(self, elements, context, filename=None, def generate_feed(self, elements, context, filename=None):
relative_urls=True):
"""Generate a feed with the list of articles provided """Generate a feed with the list of articles provided
Return the feed. If no output_path or filename is specified, just return Return the feed. If no output_path or filename is specified, just return
@ -75,22 +74,18 @@ class Generator(object):
:param context: the context to get the feed metadata. :param context: the context to get the feed metadata.
:param output_path: where to output the file. :param output_path: where to output the file.
:param filename: the filename to output. :param filename: the filename to output.
:param relative_urls: use relative urls or absolutes ones
""" """
if relative_urls: site_url = context.get('SITEURL', self._get_relative_siteurl(filename))
site_url = self._get_relative_siteurl(filename)
else:
site_url = context['SITEURL']
feed = Atom1Feed( feed = Atom1Feed(
title=context['SITENAME'], title=context['SITENAME'],
link=site_url, link=site_url,
feed_url= filename, feed_url= "%s/%s" % (site_url, filename),
description=context.get('SITESUBTITLE', '')) description=context.get('SITESUBTITLE', ''))
for element in elements: for element in elements:
feed.add_item( feed.add_item(
title=element.title, title=element.title,
link= element.url, link= "%s/%s" % (site_url, element.url),
description=element.content, description=element.content,
author_name=getattr(element, 'author', 'John Doe'), author_name=getattr(element, 'author', 'John Doe'),
pubdate=element.date) pubdate=element.date)