调整邮箱的播报，带 [echo] 的将只阅读标题

client/notifier.py

@@ -45,8 +45,11 @@ def handleEmailNotifications(self, lastDate):
             lastDate = Email.getMostRecentDate(emails)
 
         def styleEmail(e):
-            return "您有来自 %s 的新邮件 %s" % (Email.getSender(e), Email.getSubject(e, self.profile))
-
+            subject = Email.getSubject(e, self.profile)
+            if '[echo]' in subject:
+                return subject.replace('[echo]', '')
+            sender = Email.getSender(e)
+            return "您有来自 %s 的新邮件 %s" % (sender, subject)
         for e in emails:
             self.q.put(styleEmail(e))
 

client/plugins/Email.py

@@ -28,6 +28,9 @@ def getSender(msg):
     if(len(ls) == 2):
         fromname = email.Header.decode_header((ls[0]).strip('\"'))
         sender = my_unicode(fromname[0][0], fromname[0][1])
+    elif(len(ls) > 2):
+        fromname = email.Header.decode_header((msg[:msg.find('<')]).strip('\"'))
+        sender = my_unicode(fromname[0][0], fromname[0][1])
     else:
         sender = msg['From']
     return sender
@@ -44,12 +47,16 @@ def getSubject(msg, profile):
         Title of the email.
     """
     subject = email.Header.decode_header(msg['subject'])
-    sub = my_unicode(subject[0][0], subject[0][1]).replace('[read]', '')
+    sub = my_unicode(subject[0][0], subject[0][1])
     to_read = False
+    if sub.strip() == '':
+        return ''
     if 'read_email_title' in profile:
         to_read =  profile['read_email_title']
-    if '[read]' in subject or to_read:
-        return u'，邮件标题为：' + sub
+    if '[echo]' in sub:
+        return sub
+    if to_read:
+        return '邮件标题为 %s' % sub
     return ''