X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fparrot.git;a=blobdiff_plain;f=quotes.py;h=7391cf81849b804be125f3cdcbfa6ae11161b3a2;hp=5c1a58ebbd4330230334cb91c821a4296dda9a1a;hb=HEAD;hpb=598d5fb9c8929682e5785a0ec19747a153ed9e48

diff --git a/quotes.py b/quotes.py
index 5c1a58e..7391cf8 100644
--- a/quotes.py
+++ b/quotes.py
@@ -54,25 +54,50 @@ class Quote(object):
     def jsonize(self):
         d = {"author" : self.author, "content" : self.content,
              "timestamp" : self.timestamp.strftime(u"%F_%T"),
-             "place" : self.place, "quoter" : self.quoter}
+             "place" : self.proper_place, "quoter" : self.proper_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 """
-        if self.place and self.place.strip() != u"":
-            return config.quote_template_withcontext % self.__dict__
-        else:
-            return config.quote_template % self.__dict__
+        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 and self.place.strip() != u"" else u""
-        quoter = self.quoter if self.quoter and self.quoter.strip() != u"" else u""
-        return (u"%s %s | %s | %s" % (self.timestamp.strftime("%F_%T"), config.quote_template % self.__dict__
-                  , 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.
@@ -159,35 +184,42 @@ class QuoteDB(object):
         """ Sort une quote aléatoire de ``author`` """
         return random.choice(self.quotesfrom(author))
     
-    def search(self, inquote=None, author=None, regexp=False):
-        """Fait une recherche dans les quotes."""
+    def search(self, inquote=None, author=None, place=None, regexp=False):
+        """
+        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
+        *et* si ``place`` matche la place
+        
+        Si ``regexp=True``, utilise directement les termes comme des regexp.
+        """
+        params = [inquote, author, place]
         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)]
+            regexps = []
+            for param in params:
+                if param is None:
+                    param = u".*"
+                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, q.proper_place])])]
         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]
+            for (i, param) in enumerate(params):
+                if param is None:
+                    params[i] = u""
+            l = [q for q in self.quotelist if all([param.lower() in truc.lower() for (param, truc) in zip(params, [q.content, q.author, q.proper_place])])]
         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)
+                author = u".*"
+            areg = re.compile(author, flags=re.UNICODE + re.IGNORECASE)
             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]))
+                author = u""
+            l = list(set([q.author for q in self.quotelist if author.lower() in q.author.lower()]))
         return l
 
 def dump(quotedb, dump_file=None):