RSS: Fix support of feeds that do no have guid fields. Closes GH845.

This commit is contained in:
Valentin Lorentz 2014-09-14 10:06:45 +00:00
parent 15fb16a8ae
commit 44707374c0

View File

@ -286,13 +286,17 @@ class RSS(callbacks.Plugin):
self.update_feed_if_needed(feed) self.update_feed_if_needed(feed)
def get_new_entries(self, feed): def get_new_entries(self, feed):
# http://validator.w3.org/feed/docs/rss2.html#hrelementsOfLtitemgt
get_id = lambda entry: entry.id if hasattr(entry, 'id') else (
entry.title if hasattr(entry, 'title') else entry.description)
with feed.lock: with feed.lock:
entries = feed.entries entries = feed.entries
new_entries = [entry for entry in entries new_entries = [entry for entry in entries
if entry.id not in feed.announced_entries] if get_id(entry) not in feed.announced_entries]
if not new_entries: if not new_entries:
return [] return []
feed.announced_entries |= set(entry.id for entry in new_entries) feed.announced_entries |= set(get_id(entry) for entry in new_entries)
# We keep a little more because we don't want to re-announce # We keep a little more because we don't want to re-announce
# oldest entries if one of the newest gets removed. # oldest entries if one of the newest gets removed.
feed.announced_entries.truncate(10*len(entries)) feed.announced_entries.truncate(10*len(entries))