Add the search term to the subject of the email

twitterSearch.py

@@ -44,7 +44,7 @@ def __init__(self, search="softlayer", server="smtp.gmail.com",
         self.logfile = logfilename or 'tweet.id'
 
         self.date = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
-        self.subject = "%s twitter mentions %s " % ('%d', self.date)
+        self.subject = "%s %s twitter mentions %s " % ('%d','%s', self.date)
         self.smtp_message = "\n".join([
             "From: %s",
             "To: %s",
@@ -72,15 +72,15 @@ def log_value(self, value):
         with open(self.logfile, 'w+') as f:
             f.write(str(value))
 
-    def _format_message(self, subject, body, count):
+    def _format_message(self, subject, body, count,search):
         return self.smtp_message % (
             self.from_, self.to,
-            subject % count,
+            subject % (count,search),
             self.date,
             body.encode('utf8')
         )
 
-    def send_mail(self, message, count):
+    def send_mail(self, message, count,search):
         try:
             smtp = SMTP()
             smtp.connect(self.server, self.port)
@@ -89,7 +89,7 @@ def send_mail(self, message, count):
             smtp.ehlo()
             smtp.login(self.user, self.passwd)
             smtp.sendmail(self.from_, self.to, self._format_message(self.subject,
-                message, count))
+                message, count,search))
             smtp.quit()
 
         except Exception, exc:
@@ -139,4 +139,4 @@ def status_by_search(self, search):
         unformatted_body, count = notifier.status_by_search(notifier.search_term)
         if count > 0:
             body = messages_to_string(unformatted_body)
-            notifier.send_mail(body, count)
+            notifier.send_mail(body, count,key)