Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-03 08:04:07 +01:00
Code Issues Projects Releases Wiki Activity

Aka: Escape the command in help strings, so they can be copy-pasted into @aka add.

Browse Source
This commit is contained in:
Valentin Lorentz 2017-10-01 10:40:09 +02:00
parent 5ee15c38bb
commit 0998651f61
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Aka/plugin.py
View File

@ -507,12 +507,15 @@ class Aka(callbacks.Plugin):
lock = ' ' + _('Locked by %s at %s') % (locked_by, locked_at) lock = ' ' + _('Locked by %s at %s') % (locked_by, locked_at)
else: else:
lock = '' lock = ''
escaped_command = original.replace('\\', '\\\\').replace('"', '\\"')
if channel == 'global': if channel == 'global':
doc = format(_('<a global alias,%s %n>\n\nAlias for %q.%s'), doc = format(_('<a global alias,%s %n>\n\nAlias for %q.%s'),
flexargs, (biggestDollar, _('argument')), original, lock) flexargs, (biggestDollar, _('argument')),
escaped_command, lock)
else: else:
doc = format(_('<an alias on %s,%s %n>\n\nAlias for %q.%s'), doc = format(_('<an alias on %s,%s %n>\n\nAlias for %q.%s'),
channel, flexargs, (biggestDollar, _('argument')), original, lock) channel, flexargs, (biggestDollar, _('argument')),
escaped_command, lock)
f = utils.python.changeFunctionName(f, name, doc) f = utils.python.changeFunctionName(f, name, doc)
return f return f

6
plugins/Aka/test.py
View File

@ -66,10 +66,10 @@ class AkaChannelTestCase(ChannelPluginTestCase):
self.assertError('aka add unlock "echo foo bar baz"') self.assertError('aka add unlock "echo foo bar baz"')
def testAkaHelp(self): def testAkaHelp(self):
self.assertNotError('aka add slashdot foo') self.assertNotError(r'aka add slashdot "foo \"bar\" baz"')
self.assertRegexp('help slashdot', "Alias for .*foo") self.assertRegexp('help slashdot', r'Alias for "foo \\"bar\\" baz".')
self.assertNotError('aka add nonascii echo éé') self.assertNotError('aka add nonascii echo éé')
self.assertRegexp('help nonascii', "Alias for .*echo éé") self.assertRegexp('help nonascii', r'Alias for "echo éé".')
self.assertNotError('aka remove slashdot') self.assertNotError('aka remove slashdot')
self.assertNotError('aka add --channel %s slashdot foo' % self.channel) self.assertNotError('aka add --channel %s slashdot foo' % self.channel)