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

Merge pull request #1140 from gpoo/fix-invalid-atom-feed-uid

Browse source 
Fix #1039 Atom feed for sites using HTTPS or a subdirectory
This commit is contained in:
Justin Mayer 2013-11-12 17:56:13 -08:00
commit ad74464e94
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pelican/writers.py
View file

@ -8,6 +8,9 @@ import logging
if not six.PY3: if not six.PY3:
from codecs import open from codecs import open
from urlparse import urlparse
else:
from urllib.parse import urlparse
from feedgenerator import Atom1Feed, Rss201rev2Feed from feedgenerator import Atom1Feed, Rss201rev2Feed
from jinja2 import Markup from jinja2 import Markup
@ -41,11 +44,13 @@ class Writer(object):
def _add_item_to_the_feed(self, feed, item): def _add_item_to_the_feed(self, feed, item):
title = Markup(item.title).striptags() title = Markup(item.title).striptags()
link = '%s/%s' % (self.site_url, item.url)
feed.add_item( feed.add_item(
title=title, title=title,
link='%s/%s' % (self.site_url, item.url), link=link,
unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''), unique_id='tag:%s,%s:%s' % (urlparse(link).netloc,
item.date.date(), item.url), item.date.date(),
urlparse(link).path.lstrip('/')),
description=item.get_content(self.site_url), description=item.get_content(self.site_url),
categories=item.tags if hasattr(item, 'tags') else None, categories=item.tags if hasattr(item, 'tags') else None,
author_name=getattr(item, 'author', ''), author_name=getattr(item, 'author', ''),