Mercurial > xib
changeset 21:801160b4136f
Introduced a bridge's "say" attribute to offer more flexibility in what the bot says.
Signed-off-by: Charly COSTE <changaco@changaco.net>
author | Charly COSTE <changaco@changaco.net> |
---|---|
date | Thu, 20 Aug 2009 15:17:20 +0200 |
parents | 08cde283621a |
children | e2bd4de698e5 |
files | bot.py bridge.py start_bots_from_xml_config.py |
diffstat | 3 files changed, 41 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/bot.py +++ b/bot.py @@ -372,9 +372,9 @@ class bot(Thread): self.error('=> Debug: event not handled', debug=True) - def new_bridge(self, xmpp_room, irc_room, irc_server, mode, say_participants_list, irc_port=6667): + def new_bridge(self, xmpp_room, irc_room, irc_server, mode, say_level, irc_port=6667): """Create a bridge between xmpp_room and irc_room at irc_server.""" - b = bridge(self, xmpp_room, irc_room, irc_server, mode, say_participants_list, irc_port=irc_port) + b = bridge(self, xmpp_room, irc_room, irc_server, mode, say_level, irc_port=irc_port) self.bridges.append(b) return b
--- a/bridge.py +++ b/bridge.py @@ -20,22 +20,36 @@ xmpp = muc.xmpp del muc from participant import * from encoding import * +import traceback +import re class NoSuchParticipantException(Exception): pass class bridge: - def __init__(self, owner_bot, xmpp_room_jid, irc_room, irc_server, mode, say_participants_list, irc_port=6667): + + _all = 0 + _info = 1 + _notice = 2 + _warning = 3 + _error = 4 + _nothing = 5 + + + def __init__(self, owner_bot, xmpp_room_jid, irc_room, irc_server, mode, say_level, irc_port=6667): """Create a new bridge.""" self.bot = owner_bot self.irc_server = irc_server self.irc_port = irc_port self.irc_room = irc_room - self.say_participants_list = say_participants_list + if hasattr(self.__class__, '_'+say_level): + self.say_level = getattr(self.__class__, '_'+say_level) + else: + raise Exception('[Error] "'+say_level+'" is not a correct value for a bridge\'s "say_level" attribute') self.participants = [] if mode not in ['normal', 'limited', 'minimal']: - raise Exception('Error: "'+mode+'" is not a correct value for a bridge\'s "mode" attribute') + raise Exception('[Error] "'+mode+'" is not a correct value for a bridge\'s "mode" attribute') self.mode = mode # Join XMPP room @@ -43,7 +57,7 @@ class bridge: self.xmpp_room = xmpp.muc(xmpp_room_jid) self.xmpp_room.join(self.bot.xmpp_c, self.bot.nickname, callback=self._xmpp_join_callback) except: - self.bot.error('Error: joining XMPP room failed') + self.bot.error('[Error] joining XMPP room failed') raise # Join IRC room @@ -51,7 +65,7 @@ class bridge: self.irc_connection = self.bot.irc.server(irc_server, irc_port, self.bot.nickname) self.irc_connection.connect(nick_callback=self._irc_nick_callback) except: - self.bot.error('Error: joining IRC room failed') + self.bot.error('[Error] joining IRC room failed') raise self.bot.error('[Notice] bridge "'+str(self)+'" is running in '+self.mode+' mode') @@ -103,7 +117,12 @@ class bridge: except NoSuchParticipantException: pass self.bot.error('===> Debug: adding participant "'+nickname+'" from "'+protocol+'" to bridge "'+str(self)+'"', debug=True) - p = participant(self, protocol, nickname) + try: + p = participant(self, protocol, nickname) + except: + self.bot.error('===> Debug: unknown error while adding participant "'+nickname+'" from "'+protocol+'" to bridge "'+str(self)+'"', debug=True) + traceback.print_exc() + return self.participants.append(p) if self.mode != 'normal' and protocol == 'xmpp': xmpp_participants_nicknames = self.get_participants_nicknames_list(protocols=['xmpp']) @@ -187,6 +206,16 @@ class bridge: def say(self, message, on_irc=True, on_xmpp=True): """Make the bot say something.""" + if message[0] != '[': + raise Exception('[Internal Error] message does not start with "["') + if self.say_level == self.__class__._nothing: + return + level = re.findall('^\[(Info|Notice|Warning|Error)\]', message) + if len(level) == 0: + raise Exception('[Internal Error] unknown message importance "'+re.findall('^\[([^[\]]+)', message)[0]+'"') + level = level[0].lower() + if getattr(self.__class__, '_'+level) < self.say_level: + return if on_xmpp == True: self.xmpp_room.say(message) if on_irc == True:
--- a/start_bots_from_xml_config.py +++ b/start_bots_from_xml_config.py @@ -54,15 +54,14 @@ try: for bridge_el in bot_el.getElementsByTagName('bridge'): xmpp_room = bridge_el.getElementsByTagName('xmpp-room')[0] irc = bridge_el.getElementsByTagName('irc')[0] - say_participants_list = True - if bridge_el.hasAttribute('say_participants_list'): - if bridge_el.getAttribute('say_participants_list') == 'false': - say_participants_list = False + say_level = 'all' + if bridge_el.hasAttribute('say_level'): + say_level = bridge_el.getAttribute('say_level') if bridge_el.hasAttribute('mode'): mode = bridge_el.getAttribute('mode') else: mode = 'normal' - bridge_ = bot_.new_bridge(xmpp_room.getAttribute('jid'), irc.getAttribute('chan'), irc.getAttribute('server'), mode, say_participants_list) + bridge_ = bot_.new_bridge(xmpp_room.getAttribute('jid'), irc.getAttribute('chan'), irc.getAttribute('server'), mode, say_level) while True: