Refonte du système de recherche : moins de code, plus propre, et case insensitive

diff --git a/quotes.py b/quotes.py
index e8e40610b0b67e7e013b445463acd465e6d29a0f..085423ff84fa8543e681f705437e32ea4f4ea1a1 100644 (file)
--- a/quotes.py
+++ b/quotes.py
@@ -185,34 +185,31 @@ class QuoteDB(object):
         return random.choice(self.quotesfrom(author))
     
     def search(self, inquote=None, author=None, regexp=False):
-        """Fait une recherche dans les quotes."""
-        if regexp:
-            if inquote is None:
-                inquote = ".*"
-            if author is None:
-                author = ".*"
-            qreg = re.compile(inquote, flags=re.UNICODE)
-            areg = re.compile(author, flags=re.UNICODE)
-            l = [q for q in self.quotelist if qreg.match(q.content) and areg.match(q.author)]
-        else:
-            if inquote is None:
-                inquote = ""
-            if author is None:
-                author = ""
-            l = [q for q in self.quotelist if inquote in q.content and author in q.author]
+        """
+        Fait une recherche dans les quotes.
+        C'est une disjonction de cas : on garde la quote si
+        ``inquote`` matche dans le contenu
+        *ou* si ``author`` matche l'auteur
+        """
+        params = [inquote, author]
+        regexps = []
+        for param in params:
+            if param is None:
+                param = u".*"
+            elif not regexp:
+                param = u".*%s.*" % param
+            regexps.append(re.compile(param, flags=re.UNICODE + re.IGNORECASE))
+        l = [q for q in self.quotelist if all([reg.match(truc) for (reg, truc) in zip(regexps, [q.content, q.author])])]
         return l
     
     def search_authors(self, author=None, regexp=False):
         """Renvoie la liste des auteurs contenant ``author`` ou qui matchent la regexp."""
-        if regexp:
-            if author is None:
-                author = ".*"
-            areg = re.compile(author, flags=re.UNICODE)
-            l = list(set([q.author for q in self.quotelist if areg.match(q.author)]))
-        else:
-            if author is None:
-                author = ""
-            l = list(set([q.author for q in self.quotelist if author in q.author]))
+        if author is None:
+            author = u".*"
+        elif not regexp:
+            author = u".*%s.*" % author
+        areg = re.compile(author, flags=re.UNICODE + re.IGNORECASE)
+        l = list(set([q.author for q in self.quotelist if areg.match(q.author)]))
         return l
 
 def dump(quotedb, dump_file=None):