X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fparrot.git;a=blobdiff_plain;f=quotes.py;h=e280d8da6983d41abfc322eefcd89e5000461f83;hp=5561c79ce19aabbb08d1f253b7f8c0dbdcaefee5;hb=f3108f2e01a5e36d48f8d3ccd82a6a34c46d6077;hpb=4dea39b2f10d9231c72a8631cb8aeee119a96206

diff --git a/quotes.py b/quotes.py
index 5561c79..e280d8d 100644
--- a/quotes.py
+++ b/quotes.py
@@ -57,18 +57,47 @@ class Quote(object):
              "place" : self.place, "quoter" : self.quoter}
         return d
     
+    def __get_proper_place(self):
+        """
+        property function pour récupérer ``self.place``
+        mais en virant None ou des chaînes ne contenant que des whitespace.
+        """
+        return self.place if self.place and self.place.strip() != u"" else u""
+    proper_place = property(__get_proper_place)
+    
+    def __get_proper_quoter(self):
+        """
+        property function pour récupérer ``self.place``
+        mais en virant None ou des chaînes ne contenant que des whitespace.
+        """
+        return self.quoter if self.quoter and self.quoter.strip() != u"" else u""
+    proper_quoter = property(__get_proper_quoter)
+    
     def __unicode__(self):
         """ Retourne la quote affichable """
         return config.quote_template % self.__dict__
     def __str__(self):
         return unicode(self).encode("utf-8")
     
+    def display(self, show_context=False):
+        """
+        Retourne une chaîne contenant toujours la quote et l'auteur,
+        et le contexte ssi ``show_context = True``.
+        """
+        s = config.quote_template % self.__dict__
+        if show_context:
+            s = u"%s | %s" % (s, self.proper_place)
+        return s.encode("utf-8")
+    
     def full_str(self):
         """ Retourne une chaîne représentant la totalité des infos de la quote,
             tout en étant parsable et human-readable. """
-        place = self.place if self.place else ""
-        quoter = self.quoter if self.quoter else ""
-        return (u"%s %s | %s | %s" % (self.timestamp.strftime("%F_%T"), unicode(self), place, quoter)).encode("utf-8")
+        s = u"%s %s | %s | %s" % (
+            self.timestamp.strftime("%F_%T"),
+            config.quote_template % self.__dict__,
+            self.proper_place,
+            self.proper_quoter)
+        return s.encode("utf-8")
     
     def __eq__(self, otherquote):
         """ Vérifie si cette phrase n'a pas déjà été dite par la même personne.
@@ -137,7 +166,6 @@ class QuoteDB(object):
         kwargs["timestamp"] = timestamp
         newquote = Quote(**kwargs)
         if not newquote in self.quotelist:
-            self.search
             self.quotelist.append(newquote)
             return True
         return False
@@ -157,34 +185,33 @@ 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 conjonction de cas : on garde la quote si
+        ``inquote`` matche dans le contenu
+        *et* si ``author`` matche l'auteur
+        
+        Si ``regexp=True``, utilise directement les termes comme des regexp.
+        """
+        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):