!from : quote aléatoire en faisant une recherche sur l'auteur

diff --git a/parrot.py b/parrot.py
index 1f5b70def7f3b3aa91f987595253692ce024fdd7..26a204a46ecd702ecad93c5a667b5902cc5b699c 100755 (executable)
--- a/parrot.py
+++ b/parrot.py
@@ -446,18 +446,23 @@ class Parrot(ircbot.SingleServerIRCBot):
                         serv.privmsg(canal, (u"Pas de quote de %s en mémoire." % author).encode("utf-8"))
                         return
                     serv.privmsg(canal, str(q))
-            elif message.startswith(u"!author"):
+            elif message.startswith(u"!author") or message.startswith(u"!from"):
                 words = message.split()
                 cmd = words[0].lstrip("!")
-                regexp = cmd in ["author" + suffix for suffix in config.regex_suffixes]
+                regexp = any([cmd.endswith(suffix) for suffix in config.regex_suffixes])
                 search = u" ".join(words[1:])
                 authors = self.quotedb.search_authors(search, regexp)
-                if len(authors) > config.search_max_authors:
-                    authors = authors[:config.search_max_authors+1] + ["+%s" % (len(authors) - config.search_max_authors)]
-                if authors:
-                    serv.privmsg(canal, "%s: %s" % (auteur, (u", ".join(authors)).encode("utf-8")))
-                else:
+                if not authors:
                     serv.privmsg(canal, "%s: Pas d'auteur correspondant à la recherche." % (auteur,))
+                    return
+                if cmd.startswith("author"):
+                    if len(authors) > config.search_max_authors:
+                        authors = authors[:config.search_max_authors+1] + ["+%s" % (len(authors) - config.search_max_authors)]
+                    serv.privmsg(canal, "%s: %s" % (auteur, (u", ".join(authors)).encode("utf-8")))
+                elif cmd.startswith("from"):
+                    quotes = sum([self.quotedb.quotesfrom(a) for a in authors], [])
+                    q = random.choice(quotes)
+                    serv.privmsg(canal, str(q))
             elif message.startswith(u"!search"):
                 words = message.split()
                 cmd = words[0].lstrip("!")

diff --git a/quotes.py b/quotes.py
index bd05913fe316a4bf980fd09adf07f58460788d50..fae0df089c31212721df79c84991a264f29dd80a 100644 (file)
--- a/quotes.py
+++ b/quotes.py
@@ -101,9 +101,12 @@ class QuoteDB(object):
     def random(self):
         """ Sort une quote aléatoire """
         return random.choice(self.quotelist)
+    def quotesfrom(self, author):
+        """ Sort toutes les quotes de ``author`` """
+        return [q for q in self.quotelist if q.author == author]
     def randomfrom(self, author):
         """ Sort une quote aléatoire de ``author`` """
-        return random.choice([q for q in self.quotelist if q.author == author])
+        return random.choice(self.quotesfrom(author))
     
     def search(self, inquote=None, author=None, regexp=False):
         """Fait une recherche dans les quotes."""