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

diff --git a/quotes.py b/quotes.py
index 5561c79..5c1a58e 100644
--- a/quotes.py
+++ b/quotes.py
@@ -59,16 +59,20 @@ class Quote(object):
     
     def __unicode__(self):
         """ Retourne la quote affichable """
-        return config.quote_template % self.__dict__
+        if self.place and self.place.strip() != u"":
+            return config.quote_template_withcontext % self.__dict__
+        else:
+            return config.quote_template % self.__dict__
     def __str__(self):
         return unicode(self).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")
+        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")
     
     def __eq__(self, otherquote):
         """ Vérifie si cette phrase n'a pas déjà été dite par la même personne.
@@ -137,7 +141,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