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

Catch an exception when adding/replacing a factoid.

Browse Source
This commit is contained in:
James Vega 2005-01-10 18:32:05 +00:00
parent efce872b01
commit 9f612df8d9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/MoobotFactoids.py
View File

@ -409,8 +409,9 @@ class MoobotFactoids(callbacks.Privmsg):
elif 'is' in tokens: elif 'is' in tokens:
p = 'is'.__eq__ p = 'is'.__eq__
else: else:
s = 'Invalid tokens for {add,change}Factoid: %s' % \ self.log.debug('Invalid tokens for {add,replace}Factoid: %s.',
utils.quoted(tokens) tokens)
s = 'Missing an \'is\' or \'_is_\'.'
raise ValueError, s raise ValueError, s
(key, newfact) = map(' '.join, utils.itersplit(p, tokens, maxsplit=1)) (key, newfact) = map(' '.join, utils.itersplit(p, tokens, maxsplit=1))
key = self._sanitizeKey(key) key = self._sanitizeKey(key)
@ -420,7 +421,10 @@ class MoobotFactoids(callbacks.Privmsg):
# First, check and see if the entire message matches a factoid key # First, check and see if the entire message matches a factoid key
channel = plugins.getChannel(msg.args[0]) channel = plugins.getChannel(msg.args[0])
id = self._getUserId(irc, msg.prefix) id = self._getUserId(irc, msg.prefix)
(key, fact) = self._getKeyAndFactoid(tokens) try:
(key, fact) = self._getKeyAndFactoid(tokens)
except ValueError, e:
irc.error(str(e), Raise=True)
# Check and make sure it's not in the DB already # Check and make sure it's not in the DB already
if self.db.getFactoid(channel, key): if self.db.getFactoid(channel, key):
irc.error('Factoid "%s" already exists.' % key, Raise=True) irc.error('Factoid "%s" already exists.' % key, Raise=True)
@ -466,7 +470,10 @@ class MoobotFactoids(callbacks.Privmsg):
channel = plugins.getChannel(msg.args[0]) channel = plugins.getChannel(msg.args[0])
id = self._getUserId(irc, msg.prefix) id = self._getUserId(irc, msg.prefix)
del tokens[0] # remove the "no," del tokens[0] # remove the "no,"
(key, fact) = self._getKeyAndFactoid(tokens) try:
(key, fact) = self._getKeyAndFactoid(tokens)
except ValueError, e:
irc.error(str(e), Raise=True)
_ = self._getFactoid(irc, channel, key) _ = self._getFactoid(irc, channel, key)
self._checkNotLocked(irc, channel, key) self._checkNotLocked(irc, channel, key)
self.db.removeFactoid(channel, key) self.db.removeFactoid(channel, key)