Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 19:22:45 +01:00
Code Issues Projects Releases Wiki Activity

Better formatting.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-01 04:42:52 +00:00
parent a71d074e46
commit 4ab161ff60
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Owner.py
View File

@ -414,7 +414,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
irc.reply('%s: %s' % (utils.exnToString(e), irc.reply('%s: %s' % (utils.exnToString(e),
utils.quoted(s))) utils.quoted(s)))
except Exception, e: except Exception, e:
self.log.exception('Uncaught exception in Owner.eval. ' self.log.exception('Uncaught exception in Owner.eval.\n'
'This is not a bug. Please do not ' 'This is not a bug. Please do not '
'report it.') 'report it.')
irc.reply(utils.exnToString(e)) irc.reply(utils.exnToString(e))
@ -463,7 +463,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
irc.queueMsg(ircmsgs.privmsg(channel, text)) irc.queueMsg(ircmsgs.privmsg(channel, text))
announce = wrap(announce, ['text']) announce = wrap(announce, ['text'])
def defaultplugin(self, irc, msg, args): def defaultplugin(self, irc, msg, args, optlist, command, plugin):
"""[--remove] <command> [<plugin>] """[--remove] <command> [<plugin>]
Sets the default plugin for <command> to <plugin>. If --remove is Sets the default plugin for <command> to <plugin>. If --remove is
@ -471,12 +471,9 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
is given, returns the current default plugin set for <command>. is given, returns the current default plugin set for <command>.
""" """
remove = False remove = False
(optlist, rest) = getopt.getopt(args, '', ['remove'])
for (option, arg) in optlist: for (option, arg) in optlist:
if option == '--remove': if option == 'remove':
remove = True remove = True
(command, plugin) = privmsgs.getArgs(rest, optional=1)
command = callbacks.canonicalName(command)
cbs = callbacks.findCallbackForCommand(irc, command) cbs = callbacks.findCallbackForCommand(irc, command)
if remove: if remove:
try: try:
@ -488,12 +485,9 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
elif not cbs: elif not cbs:
irc.errorInvalid('command', command) irc.errorInvalid('command', command)
elif plugin: elif plugin:
cb = irc.getCallback(plugin) if not plugin.isCommand(command):
if cb is None:
irc.errorInvalid('plugin', plugin)
if not cb.isCommand(command):
irc.errorInvalid('command in the %s plugin' % plugin, command) irc.errorInvalid('command in the %s plugin' % plugin, command)
registerDefaultPlugin(command, plugin) registerDefaultPlugin(command, plugin.name())
irc.replySuccess() irc.replySuccess()
else: else:
try: try:
@ -501,6 +495,9 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
except registry.NonExistentRegistryEntry: except registry.NonExistentRegistryEntry:
s = 'I don\'t have a default plugin set for that command.' s = 'I don\'t have a default plugin set for that command.'
irc.error(s) irc.error(s)
defaultplugin = wrap(defaultplugin, [getopts({'remove': ''}),
'commandName',
additional('plugin')])
def ircquote(self, irc, msg, args, s): def ircquote(self, irc, msg, args, s):
"""<string to be sent to the server> """<string to be sent to the server>
@ -695,7 +692,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
defaultcapability = wrap(defaultcapability, defaultcapability = wrap(defaultcapability,
[('literal', ['add','remove']), 'capability']) [('literal', ['add','remove']), 'capability'])
def disable(self, irc, msg, args): def disable(self, irc, msg, args, plugin, command):
"""[<plugin>] <command> """[<plugin>] <command>
Disables the command <command> for all users (including the owners). Disables the command <command> for all users (including the owners).
@ -704,17 +701,22 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
a default capability of -plugin.command or -command (if you want to a default capability of -plugin.command or -command (if you want to
disable the command in all plugins). disable the command in all plugins).
""" """
(plugin, command) = privmsgs.getArgs(args, optional=1)
if not command:
(plugin, command) = (None, plugin)
conf.supybot.commands.disabled().add(command)
else:
conf.supybot.commands.disabled().add('%s.%s' % (plugin, command))
if command in ('enable', 'identify'): if command in ('enable', 'identify'):
irc.error('You can\'t disable %s.' % command) irc.error('You can\'t disable %s.' % command)
return
if plugin:
if plugin.isCommand(command):
pluginCommand = '%s.%s' % (plugin.name(), command)
conf.supybot.commands.disabled().add(pluginCommand)
else:
irc.error('%s is not a command in the %s plugin.' %
(command, plugin.name()))
return
else: else:
self._disabled.add(command, plugin) conf.supybot.commands.disabled().add(command)
irc.replySuccess() self._disabled.add(command, plugin)
irc.replySuccess()
disable = wrap(disable, [optional('plugin'), 'commandName'])
def enable(self, irc, msg, args): def enable(self, irc, msg, args):
"""[<plugin>] <command> """[<plugin>] <command>