Fix trigger sorting algorithm

kirsle · kirsle · commit 1c4cb296b390 · 2014-12-07T14:51:12.000-08:00
diff --git a/Changes b/Changes
@@ -4,6 +4,9 @@ Revision history for the Python package RiveScript.
 	- New algorithm for handling variable tags (<get>, <set>, <add>, <sub>,
 	  <mult>, <div>, <bot> and <env>) that allows for iterative nesting of
 	  these tags (for example, <set copy=<get orig>> will work now).
+	- Fix sorting algorithm, so triggers with matching word counts will be
+	  sorted by length descending.
+	- stream() function can accept a multiline string instead of an array
 
 1.06  Nov 25 2014
 	- Change package name from python-rivescript to simply rivescript.
diff --git a/rivescript/rivescript.py b/rivescript/rivescript.py
@@ -164,8 +164,11 @@ def load_file(self, filename):
     def stream(self, code):
         """Stream in RiveScript source code dynamically.
 
-`code` should be an array of lines of RiveScript code."""
+        `code` can either be a string containing RiveScript code or an array
+        of lines of RiveScript code."""
         self._say("Streaming code.")
+        if type(code) in [str, unicode]:
+            code = code.split("\n")
         self._parse("stream()", code)
 
     def _parse(self, fname, code):
@@ -1144,8 +1147,10 @@ def _sort_trigger_set(self, triggers):
             for ip in sorted(track.keys()):
                 self._say("ip=" + str(ip))
                 for kind in ['atomic', 'option', 'alpha', 'number', 'wild']:
-                    for i in sorted(track[ip][kind], reverse=True):
-                        running.extend(track[ip][kind][i])
+                    for wordcnt in sorted(track[ip][kind], reverse=True):
+                        # Triggers with a matching word count should be sorted
+                        # by length, descending.
+                        running.extend(sorted(track[ip][kind][wordcnt], key=len, reverse=True))
                 running.extend(sorted(track[ip]['under'], key=len, reverse=True))
                 running.extend(sorted(track[ip]['pound'], key=len, reverse=True))
                 running.extend(sorted(track[ip]['star'], key=len, reverse=True))
diff --git a/tests/config.py b/tests/config.py
@@ -7,15 +7,15 @@
 
 class RiveScriptTestCase(unittest.TestCase):
     """Base class for all RiveScript test cases, with helper functions."""
-    
+
     def setUp(self, **kwargs):
         self.rs = None # Local RiveScript bot object
         self.username = "localuser"
 
 
     def tearDown(self):
         pass
-    
+
 
     def new(self, code, **kwargs):
         """Make a bot and stream in the code."""
@@ -25,8 +25,7 @@ def new(self, code, **kwargs):
 
     def extend(self, code):
         """Stream code into the bot."""
-        lines = code.split("\n")
-        self.rs.stream(lines)
+        self.rs.stream(code)
         self.rs.sort_replies()
 
 
