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

Added the ability to have multiple targets as well as do some capability-checking on the targets.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-14 15:46:23 +00:00
parent 1a40c6fc69
commit 866e4ebd62
1 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
plugins/LogToIrc.py
View File

@ -44,6 +44,7 @@ import log
import conf import conf
import utils import utils
import world import world
import ircdb
import ircmsgs import ircmsgs
import ircutils import ircutils
import privmsgs import privmsgs
@ -53,13 +54,13 @@ import callbacks
class IrcHandler(logging.Handler): class IrcHandler(logging.Handler):
def emit(self, record): def emit(self, record):
target = conf.supybot.plugins.LogToIrc.target() config = conf.supybot.plugins.LogToIrc
try: try:
s = utils.normalizeWhitespace(self.format(record)) s = utils.normalizeWhitespace(self.format(record))
except: except:
self.handleError(record) self.handleError(record)
msg = ircmsgs.privmsg(target, s) for target in config.targets():
if target: msg = ircmsgs.privmsg(target, s)
for irc in world.ircs: for irc in world.ircs:
try: try:
if not irc.driver.connected: if not irc.driver.connected:
@ -67,11 +68,28 @@ class IrcHandler(logging.Handler):
except AttributeError, e: except AttributeError, e:
print '*** AttributeError, shouldn\'t happen: %s' % e print '*** AttributeError, shouldn\'t happen: %s' % e
continue continue
if target in irc.state.channels or \ msgOk = True
target in irc.state.nicksToHostmasks: if target in irc.state.channels:
channel = irc.state.channels[target]
for modeChar in config.channelModesRequired():
if modeChar not in channel.modes:
msgOk = False
else:
capability = config.userCapabilityRequired()
if capability:
try:
hostmask = irc.state.nicksToHostmasks[target]
except KeyError:
msgOk = False
continue
if not ircdb.checkCapability(hostmask, capability):
msgOk = False
if msgOk:
irc.queueMsg(msg) irc.queueMsg(msg)
else:
print '*** Not sending to %r' % target
class IrcFormatter(log.Formatter): class IrcFormatter(log.Formatter):
def formatException(self, ei): def formatException(self, ei):
import cStringIO import cStringIO
@ -118,23 +136,33 @@ class IrcLogLevel(log.LogLevel):
log.LogLevel.setValue(self, v) log.LogLevel.setValue(self, v)
_ircHandler.setLevel(v) _ircHandler.setLevel(v)
class ValidChannelOrNickOrNot(registry.String): class ValidChannelOrNick(registry.String):
"""Value must be a valid channel, a valid nick, or an empty string.""" """Value must be a valid channel or a valid nick."""
def setValue(self, v): def setValue(self, v):
if v: if not (ircutils.isNick(v) or ircutils.isChannel(v)):
if not (ircutils.isNick(v) or ircutils.isChannel(v)): self.error()
self.error()
registry.String.setValue(self, v) registry.String.setValue(self, v)
class Targets(registry.SpaceSeparatedListOfStrings):
Value = ValidChannelOrNick
conf.registerPlugin('LogToIrc') conf.registerPlugin('LogToIrc')
conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'level', conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'level',
IrcLogLevel(logging.WARNING, """Determines what the minimum priority IrcLogLevel(logging.WARNING, """Determines what the minimum priority
level logged will be to IRC. See supybot.log.level for possible level logged will be to IRC. See supybot.log.level for possible
values. DEBUG is disabled due to the large quantity of output.""")) values. DEBUG is disabled due to the large quantity of output."""))
conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'target', conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'targets',
ValidChannelOrNickOrNot('', """Determines which channel/nick the bot should Targets([], """Determines which channels/nicks the bot should
log to. If no channel/nick is set, this plugin will be effectively log to. If no channels/nicks are set, this plugin will effectively be
off.""")) turned off."""))
conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'channelModesRequired',
registry.String('s', """Determines what channel modes a channel will be
required to have for the bot to log to the channel. If this string is
empty, no modes will be checked."""))
conf.registerGlobalValue(conf.supybot.plugins.LogToIrc,
'userCapabilityRequired', registry.String('owner', """Determines what
capability is required for the bot to log to in private messages to the
user. If this is empty, there will be no capability that's checked."""))
conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'colorized', conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'colorized',
registry.Boolean(False, """Determines whether the bot's logs registry.Boolean(False, """Determines whether the bot's logs
to IRC will be colorized with mIRC colors.""")) to IRC will be colorized with mIRC colors."""))
@ -174,9 +202,10 @@ class LogToIrc(callbacks.Privmsg):
log._logger.removeHandler(_ircHandler) log._logger.removeHandler(_ircHandler)
def do376(self, irc, msg): def do376(self, irc, msg):
target = self.registryValue('target') targets = self.registryValue('targets')
if target and ircutils.isChannel(target): for target in targets:
irc.queueMsg(ircmsgs.join(target)) if ircutils.isChannel(target):
irc.queueMsg(ircmsgs.join(target))
do377 = do422 = do376 do377 = do422 = do376