Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-14 17:59:29 +02:00
Code Issues Projects Releases Wiki Activity

Made sure plugins are sorted in error messages.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-10-24 21:35:59 +00:00
parent 388da451f2
commit 143448c50a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Misc.py
View File

@ -92,18 +92,20 @@ class Misc(callbacks.Privmsg):
ambiguousCommands[command] = [cb.name() for cb in cbs] ambiguousCommands[command] = [cb.name() for cb in cbs]
if ambiguousCommands: if ambiguousCommands:
if len(ambiguousCommands) == 1: # Common case. if len(ambiguousCommands) == 1: # Common case.
(command, cbs) = ambiguousCommands.popitem() (command, names) = ambiguousCommands.popitem()
names.sort()
s = 'The command %r is available in the %s plugins. '\ s = 'The command %r is available in the %s plugins. '\
'Please specify the plugin whose command you ' \ 'Please specify the plugin whose command you ' \
'wish to call by using its name as a command ' \ 'wish to call by using its name as a command ' \
'before %r' % \ 'before calling it.' % \
(command, utils.commaAndify(cbs), command) (command, utils.commaAndify(names), command)
else: else:
L = [] L = []
while ambiguousCommands: while ambiguousCommands:
(command, cbs) = ambiguousCommands.popitem() (command, names) = ambiguousCommands.popitem()
names.sort()
L.append('The command %r is available in the %s ' L.append('The command %r is available in the %s '
'plugins' % (command, utils.commaAndify(cbs))) 'plugins' %(command,utils.commaAndify(names)))
s = '%s; please specify from which plugins to ' \ s = '%s; please specify from which plugins to ' \
'call these commands.' % '; '.join(L) 'call these commands.' % '; '.join(L)
irc.queueMsg(callbacks.reply(msg, 'Error: ' + s)) irc.queueMsg(callbacks.reply(msg, 'Error: ' + s))
@ -185,15 +187,15 @@ class Misc(callbacks.Privmsg):
if cb is not None: if cb is not None:
command = callbacks.canonicalName(privmsgs.getArgs(args[1:])) command = callbacks.canonicalName(privmsgs.getArgs(args[1:]))
command = command.lstrip(conf.prefixChars) command = command.lstrip(conf.prefixChars)
name = ' '.join(args)
if hasattr(cb, 'isCommand') and cb.isCommand(command): if hasattr(cb, 'isCommand') and cb.isCommand(command):
method = getattr(cb, command) method = getattr(cb, command)
if hasattr(method, '__doc__') and method.__doc__ != None: if hasattr(method, '__doc__') and method.__doc__ != None:
irc.reply(msg, callbacks.getHelp(method)) irc.reply(msg, callbacks.getHelp(method, name=name))
else: else:
irc.error(msg, 'That command has no help.') irc.error(msg, 'That command has no help.')
else: else:
irc.error(msg, 'There is no such command %s %s.' % irc.error(msg, 'There is no such command %s.' % name)
(args[0], command))
else: else:
irc.error(msg, 'There is no such plugin %s' % args[0]) irc.error(msg, 'There is no such plugin %s' % args[0])
return return
@ -202,10 +204,11 @@ class Misc(callbacks.Privmsg):
command = command.lstrip(conf.prefixChars) command = command.lstrip(conf.prefixChars)
cbs = callbacks.findCallbackForCommand(irc, command) cbs = callbacks.findCallbackForCommand(irc, command)
if len(cbs) > 1: if len(cbs) > 1:
names = [cb.name() for cb in cbs]
names.sort()
irc.error(msg, 'That command exists in the %s plugins. ' irc.error(msg, 'That command exists in the %s plugins. '
'Please specify exactly which plugin command ' 'Please specify exactly which plugin command '
'you want help with.'% \ 'you want help with.'% utils.commaAndify(names))
utils.commaAndify([cb.name() for cb in cbs]))
return return
elif not cbs: elif not cbs:
irc.error(msg, 'There is no such command %s.' % command) irc.error(msg, 'There is no such command %s.' % command)
@ -213,7 +216,7 @@ class Misc(callbacks.Privmsg):
cb = cbs[0] cb = cbs[0]
method = getattr(cb, command) method = getattr(cb, command)
if hasattr(method, '__doc__') and method.__doc__ is not None: if hasattr(method, '__doc__') and method.__doc__ is not None:
irc.reply(msg, callbacks.getHelp(method)) irc.reply(msg, callbacks.getHelp(method, name=command))
else: else:
irc.error(msg, '%s has no help.' % command) irc.error(msg, '%s has no help.' % command)