Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 11:42:52 +01:00
Code Issues Projects Releases Wiki Activity

RSS: show soft errors set by feedparser when no entries are found

Browse Source 
Hopefully this will ease debugging - e.g. a bad TLS certificate will now show
"Error: Couldn't get RSS feed. Parser error: <urlopen error
 [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:720)>"
instead of only a generic message.
This commit is contained in:
James Lu 2018-10-14 12:38:10 -07:00
parent c1d3bad64f
commit 2fdc433cb3
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/RSS/plugin.py
View File

@ -92,7 +92,7 @@ class InvalidFeedUrl(ValueError):
class Feed: class Feed:
__slots__ = ('url', 'name', 'data', 'last_update', 'entries', __slots__ = ('url', 'name', 'data', 'last_update', 'entries',
'etag', 'modified', 'initial', 'etag', 'modified', 'initial',
'lock', 'announced_entries') 'lock', 'announced_entries', 'last_exception')
def __init__(self, name, url, initial, def __init__(self, name, url, initial,
plugin_is_loading=False, announced=None): plugin_is_loading=False, announced=None):
assert name, name assert name, name
@ -113,6 +113,7 @@ class Feed:
self.lock = threading.Lock() self.lock = threading.Lock()
self.announced_entries = announced or \ self.announced_entries = announced or \
utils.structures.TruncatableSet() utils.structures.TruncatableSet()
self.last_exception = None
def __repr__(self): def __repr__(self):
return 'Feed(%r, %r, %b, <bool>, %r)' % \ return 'Feed(%r, %r, %b, <bool>, %r)' % \
@ -328,6 +329,16 @@ class RSS(callbacks.Plugin):
feed.data = d.feed feed.data = d.feed
feed.entries = d.entries feed.entries = d.entries
feed.last_update = time.time() feed.last_update = time.time()
# feedparser will store soft errors in bozo_exception and set
# the "bozo" bit to 1 on supported platforms:
# https://pythonhosted.org/feedparser/bozo.html
# If this error caused us to e.g. not get any entries at all,
# it may be helpful to show it as well.
if getattr(d, 'bozo', 0) and hasattr(d, 'bozo_exception'):
feed.last_exception = d.bozo_exception
else:
feed.last_exception = None
(initial, feed.initial) = (feed.initial, False) (initial, feed.initial) = (feed.initial, False)
self.announce_feed(feed, initial) self.announce_feed(feed, initial)
@ -555,7 +566,12 @@ class RSS(callbacks.Plugin):
self.update_feed_if_needed(feed) self.update_feed_if_needed(feed)
entries = feed.entries entries = feed.entries
if not entries: if not entries:
irc.error(_('Couldn\'t get RSS feed.')) s = _('Couldn\'t get RSS feed.')
# If we got a soft parsing exception on our last run, show the error.
if feed.last_exception is not None:
s += _(' Parser error: ')
s += str(feed.last_exception)
irc.error(s)
return return
n = n or self.registryValue('defaultNumberOfHeadlines', channel) n = n or self.registryValue('defaultNumberOfHeadlines', channel)
entries = list(filter(lambda e:self.should_send_entry(channel, e), entries = list(filter(lambda e:self.should_send_entry(channel, e),