X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;ds=sidebyside;f=sid%2Ffeeds.py;h=a40f7662e8f14383d1d55089dd12f59fa91b82b5;hb=bb9811987721c5443ec1b8f23a3bc47ac1604823;hp=b3dd19f43147d857cd8f68930e4f3ef998c521e3;hpb=f0c5210d24a5b4ffd71f4280fe8d40ff6ca3b742;p=sid.git
diff --git a/sid/feeds.py b/sid/feeds.py
index b3dd19f..a40f766 100644
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -58,23 +58,23 @@ class FeedMonitor(threading.Thread):
# Cannot resolve address
if 'status' not in parsed_feed:
- self.plugin.log.error('Error from "%s": %s.' %
- (feed, parsed_feed.bozo_exception.__repr__()))
+ self.plugin.log.error('Error from "%s": %s.',
+ feed, parsed_feed.bozo_exception.__repr__())
return
# unusual return http code
if parsed_feed.status != 200:
- self.plugin.log.error(
- 'Got code %(status)d from "%(href)s" (please update).' %
- parsed_feed)
+ self.plugin.log.warning(
+ 'Got code %(status)d from "%(href)s" (please update).',
+ parsed_feed)
return
feed_updated = parsed_feed.feed.get('updated_parsed', None)
# Avoid looping over all posts if possible
if feed_updated and strtm_to_dtm(feed_updated) < self.last_check:
- self.plugin.log.debug('updated : %s' % strtm_to_dtm(feed_updated))
- self.plugin.log.debug('last check: %s' % self.last_check)
+ self.plugin.log.debug('updated : %s', strtm_to_dtm(feed_updated))
+ self.plugin.log.debug('last check: %s', self.last_check)
return
title = '"%s":' % parsed_feed.feed.get('title', 'n/a')
@@ -99,14 +99,16 @@ class FeedMonitor(threading.Thread):
body = '%(title)s %(link)s' % post
text.append(body)
- xpost = dict(**post)
- xpost['title'] = html_escape(xpost.get('title', 'n/a'))
- xbody = '%(title)s' % xpost
+ xpost = {'title': html_escape(post.get('title', 'n/a'))}
+ xpost['link'] = html_escape(post.get('link',))
+ xbody = '{title}'.format(**xpost)
xhtml.append(xbody)
# Updating self.seen
self.seen[feed_id] = entries
if len(text) > 1:
- self.plugin.send({'mbody':'
'.join(xhtml), 'mhtml':'\n'.join(text)})
+ self.plugin.send(self.plugin.bot.room,
+ {'mhtml':'
'.join(xhtml), 'mbody':'\n'.join(text)},
+ mtype='groupchat')
def run(self):
while not self.thread_killed:
@@ -115,7 +117,7 @@ class FeedMonitor(threading.Thread):
try:
self.new_posts(feed)
except Exception as err:
- self.plugin.log.error('feeds thread crashed: %s' % err)
+ self.plugin.log.error('feeds thread crashed: %s', err)
self.plugin.log.error(''.join(traceback.format_exc()))
self.thread_killed = True
self.last_check = datetime.datetime.utcnow()
@@ -154,12 +156,12 @@ class Feeds(Plugin):
self.th_mon.thread_killed = True
@botcmd
- def feeds(self, message, args):
+ def feeds(self, rcv, args):
"""feeds monitors debian project related feeds.
!feeds : registred feeds list
!feeds last : last check time"""
if 'last' in args:
- self.send('Last feeds check: %s' % self.th_mon.last_check)
+ self.reply(rcv, 'Last feeds check: %s' % self.th_mon.last_check)
return
html = ['{1}'.format(html_escape(u),
html_escape(u[7:])
@@ -168,4 +170,4 @@ class Feeds(Plugin):
'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
'mhtml': 'Feeds:
' + '
'.join(html),
}
- self.send(msg)
+ self.reply(rcv, msg)