rss: Support feeds that don't provide any sort of timestamp.

(imported from commit 9acc9dad7543a0e0a6bc2e71360b7017c3c7c63d)
This commit is contained in:
Tim Abbott 2014-02-11 17:05:17 -05:00
parent 45a8b050ac
commit 3caa743951
1 changed files with 2 additions and 2 deletions

View File

@ -136,7 +136,7 @@ def strip_tags(html):
def compute_entry_hash(entry): def compute_entry_hash(entry):
entry_time = entry.get("published", entry.get("updated")) entry_time = entry.get("published", entry.get("updated"))
entry_id = entry.get("id", entry.get("link")) entry_id = entry.get("id", entry.get("link"))
return hashlib.md5(entry_id + entry_time).hexdigest() return hashlib.md5(entry_id + str(entry_time)).hexdigest()
def elide_subject(subject): def elide_subject(subject):
MAX_TOPIC_LENGTH = 60 MAX_TOPIC_LENGTH = 60
@ -184,7 +184,7 @@ for feed_url in feed_urls:
entry_hash = compute_entry_hash(entry) entry_hash = compute_entry_hash(entry)
# An entry has either been published or updated. # An entry has either been published or updated.
entry_time = entry.get("published_parsed", entry.get("updated_parsed")) entry_time = entry.get("published_parsed", entry.get("updated_parsed"))
if (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24: if entry_time is not None and (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24:
# As a safeguard against misbehaving feeds, don't try to process # As a safeguard against misbehaving feeds, don't try to process
# entries older than some threshold. # entries older than some threshold.
continue continue