Fix links in feeds, ref #361

This commit is contained in:
Simon Conseil
2019-02-11 21:44:07 +01:00
parent af67de6ee5
commit 86397a26ba

View File

@@ -54,12 +54,13 @@ def generate_feed(gallery, medias, feed_type=None, feed_url='', nb_items=0):
theme = gallery.settings['theme']
nb_medias = len(medias)
nb_items = min(nb_items, nb_medias) if nb_items > 0 else nb_medias
base_url = feed_url.rsplit('/', maxsplit=1)[0]
for item in medias[:nb_items]:
if theme == 'galleria':
link = '%s/%s/#%s' % (feed_url, item.path, item.url)
link = '%s/%s/#%s' % (base_url, item.path, item.url)
else:
link = '%s/%s/' % (feed_url, item.path)
link = '%s/%s/' % (base_url, item.path)
feed.add_item(
title=Markup.escape(item.title or item.url),
@@ -67,7 +68,7 @@ def generate_feed(gallery, medias, feed_type=None, feed_url='', nb_items=0):
# unique_id='tag:%s,%s:%s' % (urlparse(link).netloc,
# item.date.date(),
# urlparse(link).path.lstrip('/')),
description='<img src="%s/%s/%s" />' % (feed_url, item.path,
description='<img src="%s/%s/%s" />' % (base_url, item.path,
item.thumbnail),
# categories=item.tags if hasattr(item, 'tags') else None,
author_name=getattr(item, 'author', ''),