Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

RSS: Allow feed-specific format. Closes GH-104.

Browse Source
This commit is contained in:
Valentin Lorentz 2014-07-31 23:50:27 +02:00
parent 1265f9229a
commit 3a127e884e
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/RSS/plugin.py
View File

@ -93,7 +93,7 @@ class Feed:
seconds, which defaults to 1800 (30 minutes) since that's what most seconds, which defaults to 1800 (30 minutes) since that's what most
websites prefer."""), self.name, self.url) websites prefer."""), self.name, self.url)
def f(self2, irc, msg, args): def f(self2, irc, msg, args):
args.insert(0, self.url) args.insert(0, self.name)
self2.rss(irc, msg, args) self2.rss(irc, msg, args)
f = utils.python.changeFunctionName(f, self.name, docstring) f = utils.python.changeFunctionName(f, self.name, docstring)
f = types.MethodType(f, plugin) f = types.MethodType(f, plugin)
@ -176,6 +176,13 @@ class RSS(callbacks.Plugin):
self.registryValue('feeds').add(name) self.registryValue('feeds').add(name)
group = self.registryValue('feeds', value=False) group = self.registryValue('feeds', value=False)
conf.registerGlobalValue(group, name, registry.String(url, '')) conf.registerGlobalValue(group, name, registry.String(url, ''))
feed_group = conf.registerGroup(group, name)
conf.registerChannelValue(feed_group, 'format',
registry.String('', """Feed-specific format. Defaults to
supybot.plugins.RSS.format if empty."""))
conf.registerChannelValue(feed_group, 'announceFormat',
registry.String('', """Feed-specific announce format.
Defaults to supybot.plugins.RSS.announceFormat if empty."""))
def register_feed(self, name, url, plugin_is_loading, announced=[]): def register_feed(self, name, url, plugin_is_loading, announced=[]):
self.feed_names[name] = url self.feed_names[name] = url
@ -295,10 +302,13 @@ class RSS(callbacks.Plugin):
return True return True
def format_entry(self, channel, feed, entry, is_announce): def format_entry(self, channel, feed, entry, is_announce):
if is_announce: key_name = 'announceFormat' if is_announce else 'format'
template = self.registryValue('announceFormat', channel) if feed.name in self.registryValue('feeds'):
specific_key_name = registry.join(['feeds', feed.name, key_name])
template = self.registryValue(specific_key_name, channel) or \
self.registryValue(key_name, channel)
else: else:
template = self.registryValue('format', channel) template = self.registryValue(key_name, channel)
date = entry.get('published_parsed', entry.get('updated_parsed')) date = entry.get('published_parsed', entry.get('updated_parsed'))
date = utils.str.timestamp(date) date = utils.str.timestamp(date)
return string.Template(template).safe_substitute(template, return string.Template(template).safe_substitute(template,
@ -398,7 +408,7 @@ class RSS(callbacks.Plugin):
@internationalizeDocstring @internationalizeDocstring
def rss(self, irc, msg, args, url, n): def rss(self, irc, msg, args, url, n):
"""<url> [<number of headlines>] """<name|url> [<number of headlines>]
Gets the title components of the given RSS feed. Gets the title components of the given RSS feed.
If <number of headlines> is given, return only that many headlines. If <number of headlines> is given, return only that many headlines.
@ -424,7 +434,7 @@ class RSS(callbacks.Plugin):
entries) entries)
sep = self.registryValue('headlineSeparator', channel) sep = self.registryValue('headlineSeparator', channel)
irc.replies(headlines, joiner=sep) irc.replies(headlines, joiner=sep)
rss = wrap(rss, ['url', additional('int')]) rss = wrap(rss, [first('url', 'feedName'), additional('int')])
@internationalizeDocstring @internationalizeDocstring
def info(self, irc, msg, args, url): def info(self, irc, msg, args, url):

15
plugins/RSS/test.py
View File

@ -98,6 +98,21 @@ class RSSTestCase(ChannelPluginTestCase):
self._feedMsg('rss remove xkcd') self._feedMsg('rss remove xkcd')
feedparser._open_resource = old_open feedparser._open_resource = old_open
def testFeedSpecificFormat(self):
old_open = feedparser._open_resource
feedparser._open_resource = constant(xkcd_old)
try:
self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
self.assertNotError('rss add xkcdsec https://xkcd.com/rss.xml')
self.assertNotError('config plugins.RSS.feeds.xkcd.format foo')
self.assertRegexp('config plugins.RSS.feeds.xkcd.format', 'foo')
self.assertRegexp('xkcd', 'foo')
self.assertNotRegexp('xkcdsec', 'foo')
finally:
self._feedMsg('rss remove xkcd')
self._feedMsg('rss remove xkcdsec')
feedparser._open_resource = old_open
if network: if network:
def testRssinfo(self): def testRssinfo(self):
self.assertNotError('rss info %s' % url) self.assertNotError('rss info %s' % url)