for Factoids: make approximate fuzzy key searches also when invoking whatis directly.

also add tests.
while there, remove useless config setting for replyinvalidcommand testing, since it is true by default.

plugins/Factoids/config.py

@@ -60,11 +60,11 @@ conf.registerChannelValue(Factoids, 'replyWhenInvalidCommand',
     registry.Boolean(True,  _("""Determines whether the bot will reply to invalid
     commands by searching for a factoid; basically making the whatis
     unnecessary when you want all factoids for a given key.""")))
-conf.registerChannelValue(Factoids, 'replyWhenInvalidCommandSearchKeys',
-    registry.Boolean(True,  _("""If replyWhenInvalidCommand is True, and you
-    supply a nonexistent factoid as a command, this setting make the bot try a
-    wildcard search for factoid keys, returning a list of matching keys,
-    before giving up with an invalid command error.""")))
+conf.registerChannelValue(Factoids, 'replyApproximateSearchKeys',
+    registry.Boolean(True,  _("""If you try to look up a nonexistent factoid,
+    this setting make the bot try to find some possible matching keys through
+    several approximate matching algorithms and return a list of matching keys,
+    before giving up.""")))
 conf.registerChannelValue(Factoids, 'format',
     FactoidFormat(_('$key could be $value.'), _("""Determines the format of
     the response given when a factoid's value is requested.  All the standard

plugins/Factoids/plugin.py

@@ -194,7 +194,6 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
                           ORDER BY factoids.id
                           LIMIT 20""", (key,))
         return cursor.fetchall()
-        #return [t[0] for t in cursor.fetchall()]
     
     def _searchFactoid(self, channel, key):
         """Try to typo-match input to possible factoids.
@@ -272,6 +271,16 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
         elif error:
             irc.error(_('No factoid matches that key.'))
 
+    def _replyApproximateFactoids(self, irc, msg, channel, key, error=True):
+        if self.registryValue('replyApproximateSearchKeys'):
+            factoids = self._searchFactoid(channel, key)
+            if factoids:
+                keylist = ["'%s'" % (fact,) for fact in factoids]
+                keylist = ', '.join(keylist)
+                irc.reply("I do not know about '%s', but I do know about these similar topics: %s" % (key, keylist))
+            elif error:
+                irc.error('No factoid matches that key.')
+
     def invalidCommand(self, irc, msg, tokens):
         if irc.isChannel(msg.args[0]):
             channel = msg.args[0]
@@ -281,12 +290,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
                 if factoids:
                     self._replyFactoids(irc, msg, key, channel, factoids, error=False)
                 else:
-                    if self.registryValue('replyWhenInvalidCommandSearchKeys'):
-                        factoids = self._searchFactoid(channel, key)
-                        if factoids:
-                            keylist = ["'%s'" % (fact,) for fact in factoids]
-                            keylist = ', '.join(keylist)
-                            irc.reply("I do not know about '%s', but I do know about these similar topics: %s" % (key, keylist))
+                    self._replyApproximateFactoids(irc, msg, channel, key, error=False)
 
     @internationalizeDocstring
     def whatis(self, irc, msg, args, channel, words):
@@ -304,7 +308,10 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
                     irc.errorInvalid(_('key id'))
         key = ' '.join(words)
         factoids = self._lookupFactoid(channel, key)
-        self._replyFactoids(irc, msg, key, channel, factoids, number)
+        if factoids:
+            self._replyFactoids(irc, msg, key, channel, factoids, number)
+        else:
+            self._replyApproximateFactoids(irc, msg, channel, key)
     whatis = wrap(whatis, ['channel', many('something')])
 
     @internationalizeDocstring

plugins/Factoids/test.py

@@ -157,22 +157,22 @@ class FactoidsTestCase(ChannelPluginTestCase):
                 showFactoidIfOnlyOneMatch.setValue(orig)
 
     def testInvalidCommand(self):
-        orig = conf.supybot.plugins.Factoids.replyWhenInvalidCommand()
-        try:
-            conf.supybot.plugins.Factoids.\
-                replyWhenInvalidCommand.setValue(True)
-            self.assertNotError('learn foo as bar')
-            self.assertRegexp('foo', 'bar')
-            self.assertNotError('learn mooz as cowz')
-            self.assertRegexp('moo', 'mooz')
-            self.assertRegexp('mzo', 'mooz')
-            self.assertRegexp('moz', 'mooz')
-            self.assertNotError('learn moped as pretty fast')
-            self.assertRegexp('moe', 'mooz.*moped')
-            self.assertError('nosuchthing')
-        finally:
-            conf.supybot.plugins.Factoids.\
-                replyWhenInvalidCommand.setValue(orig)
+        self.assertNotError('learn foo as bar')
+        self.assertRegexp('foo', 'bar')
+        self.assertNotError('learn mooz as cowz')
+        self.assertRegexp('moo', 'mooz')
+        self.assertRegexp('mzo', 'mooz')
+        self.assertRegexp('moz', 'mooz')
+        self.assertNotError('learn moped as pretty fast')
+        self.assertRegexp('moe', 'mooz.*moped')
+        self.assertError('nosuchthing')
+    
+    def testWhatis(self):
+        self.assertNotError('learn foo as bar')
+        self.assertRegexp('whatis foo', 'bar')
+        self.assertRegexp('whatis foob', 'foo')
+        self.assertNotError('learn foob as barb')
+        self.assertRegexp('whatis foom', 'foo.*foob')
     
     def testAlias(self):
         self.assertNotError('learn foo as bar')