Recherche de regexp/auteur (éventuellement par regexp)

diff --git a/quotes.py b/quotes.py
index 1365b1211868bc51a235c4e9f2d50d6aa4cdb93e..c1aca7617cbe1017cb4dc128c1b64b628e126a89 100644 (file)
--- a/quotes.py
+++ b/quotes.py
@@ -99,6 +99,37 @@ class QuoteDB(object):
     def randomfrom(self, author):
         """ Sort une quote aléatoire de ``author`` """
         return random.choice([q for q in self.quotelist if q.author == 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]
+        return l
+
+    def search_authors(self, author=None, regexp=False):
+        """Renvoie la liste des auteur 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]))
+        return l
 
 def dump(quotedb, dump_file=None):
     """Pour exporter les quotes dans un format readable vers un fichier."""