Changeset 52 for branches/3.0/turbomail/message.py

Timestamp:

10/26/07 05:48:32 (1 year ago)

Author:

amcgregor

Message:

TurboMail 3.0 is now usable: the smtp and debug providers are working, immediate and demand managers are good-to-go, and S/MIME signatures work, too\!

Files:

• branches/3.0/turbomail/message.py (modified) (14 diffs)

branches/3.0/turbomail/message.py

@@ -4 +4 @@
 
 import turbomail
+from turbomail import release
 from turbomail.util import AddressList
-from turbomail.release import version
 import re, os, email
 
@@ -31 +31 @@
         This allows you to define your own message to be delivered."""
         
-        def __init__(self, sender=None, recipients=[], message=None):
+        def __init__(self, id=None, sender=None, recipients=[], message=None):
+                self.id = id
                 self.sender = sender
                 self.recipients = recipients
                 self.message = message
+                
+                if not self.id: self.id = uuid()
+                
+                super(StubMessage, self).__init__()
         
         def __str__(self):
@@ -58 +63 @@
                 
                 def configget(name, key, default=None):
-                        pass
+                        return kw.get(name, turbomail.config.get(key, default))
                 
                 self.date = kw.get("date", formatdate(localtime=True))
                 
-                self._senders = AddressList(kw.get("sender", turbomail.config.get("mail.message.sender", None)))
-                self._senders = AddressList(kw.get("senders", turbomail.config.get("mail.message.senders", self._senders)))
-                self._envelope = AddressList(kw.get("envelope", turbomail.config.get("mail.message.envelope", None)))
-                self._reply = AddressList(kw.get("reply", turbomail.config.get("mail.message.reply", None)))
+                if 'authors' in kw: kw['author'] == kw['authors']
+                if 'senders' in kw: kw['sender'] == kw['senders']
+                
+                self._author = AddressList(configget("from", "mail.message.author"))
+                self._sender = AddressList(configget("sender", "mail.message.sender"))
+                self._reply = AddressList(configget("reply", "mail.message.reply"))
                 self._to = AddressList(kw.get("to", None))
-                self._cc = AddressList(kw.get("cc", turbomail.config.get("mail.message.cc", None)))
-                self._bcc = AddressList(kw.get("bcc", turbomail.config.get("mail.message.bcc", None)))
-                self._disposition = AddressList(kw.get("disposition", turbomail.config.get("mail.message.disposition", None)))
-                
-                self.organization = kw.get("organization", turbomail.config.get("mail.message.organization", None))
-                self.encoding = kw.get("encoding", turbomail.config.get("mail.encoding", 'us-ascii'))
-                self.priority = kw.get("priority", turbomail.config.get("mail.message.priority", None))
+                self._cc = AddressList(configget("cc", "mail.message.cc"))
+                self._bcc = AddressList(configget("bcc", "mail.message.bcc"))
+                self._disposition = AddressList(configget("disposition", "mail.message.disposition"))
+                
+                self.organization = configget("organization", "mail.message.organization")
+                self.encoding = configget("encoding", "mail.encoding", 'us-ascii')
+                self.priority = configget("priority", "mail.message.priority")
                 self.subject = kw.get("subject", None)
                 self.plain = kw.get("plain", None)
@@ -79 +86 @@
                 self.attachments = kw.get("attachments", [])
                 self.embedded = kw.get("embedded", [])
-                self.headers = kw.get("headers", turbomail.config.get("mail.message.headers", []))
-                self.tries = kw.get("tries", turbomail.config.get("mail.tries", 3))
+                self.headers = configget("headers", "mail.message.headers", [])
+                self.tries = configget("tries", "mail.tries", 3)
                 
                 self._id = kw.get("id", None)
@@ -94 +101 @@
                 return self.mime.as_string()
         
-        def _get_sender(self):
-                if self._envelope:
-                        return self._envelope.addresses[0]
-                return self._senders.addresses[0]
-        
-        sender = AddressList.protected('_senders')
-        senders = AddressList.protected('_senders')
-        envelope = AddressList.protected('_envelope')
+        author = AddressList.protected('_author')
+        authors = AddressList.protected('_author')
+        sender = AddressList.protected('_sender')
+        senders = AddressList.protected('_sender')
         reply = AddressList.protected('_reply')
         to = AddressList.protected('_to')
@@ -114 +117 @@
                 
                 return self._id
+        
         id = property(id)
         
+        def envelope(self):
+                if self.sender and self.senders != self.author:
+                        return AddressList(self.senders)
+                return AddressList(self.author)
+        
+        envelope = property(envelope)
+        
         def recipients(self):
-                return [isinstance(i, tuple) and i[1] or i for i in self.to + self.cc + self.bcc]
+                return AddressList(self.to + self.cc + self.bcc)
+        
         recipients = property(recipients)
         
@@ -123 +135 @@
                 """Produce the final MIME message."""
 
-                assert self.senders, "You must specify a sender."
+                assert self.author, "You must specify an author."
                 assert self.subject, "You must specify a subject."
                 assert self.to or self.cc or self.bcc, "You must specify at least one recipient."
@@ -134 +146 @@
                 
                 plain = MIMEText(self._callable(self.plain).encode(self.encoding), 'plain', self.encoding)
-                rich = self.rich and MIMEText(self._callable(self.rich).encode(self.encoding), 'html', self.encoding) or None
-
+                
+                rich = None
+                if self.rich:
+                        rich = MIMEText(self._callable(self.rich).encode(self.encoding), 'html', self.encoding)
+                
                 def generate_mime():
                         if not rich: return plain
-
+                        
                         message = MIMEMultipart('alternative')
                         message.attach(plain)
-
+                        
                         if not self.embedded:
                                 message.attach(rich)
-
+                        
                         else:
                                 embedded = MIMEMultipart('related')
@@ -150 +165 @@
                                 for attachment in self.embedded: embedded.attach(attachment)
                                 message.attach(embedded)
-
+                        
                         return message
-
+                
                 message = generate_mime()
-
+                
                 if self.attachments:
                         attachments = MIMEMultipart()
@@ -160 +175 @@
                         for attachment in self.attachments: attachments.attach(attachment)
                         message = attachments
-
+                
+                if hasattr(self, "process_mime_message"):
+                        message = self.process_mime_message(message)
+                
                 headers = [
-                                ('Sender', self.sender), # AddressList
-                                ('From', self.senders), # AddressList
-                                ('Reply-To', self.reply), # AddressList
+                                ('Sender', self.sender),
+                                ('From', self.author),
+                                ('Reply-To', self.reply),
                                 ('Subject', self.subject),
                                 ('Date', self.date),
-                                ('To', self.to), # AddressList
-                                ('Cc', self.cc), # AddressList
-                                ('Disposition-Notification-To', self.disposition), # AddressList
+                                ('To', self.to),
+                                ('Cc', self.cc),
+                                ('Disposition-Notification-To', self.disposition),
                                 ('Organization', self.organization),
                                 ('X-Priority', self.priority),
-                                ('X-Mailer', "TurboMail <http://www.python-turbomail.org/>"),
-                                ('X-TurboMail-Version', version),
-                                ('X-TurboMail-Message-GUID', self.id),
-                                ('X-TurboMail-Extensions', "manager.demand v.1.0, provider.smtp v.1.0")
                         ]
-
+                
+                if turbomail.config.get("mail.brand", True):
+                        headers.extend([
+                                        ('X-Mailer', "%s <%s>" % (release.name, release.url)),
+                                        ('X-TurboMail-Version', release.version),
+                                        ('X-TurboMail-Message-GUID', self.id),
+                                ])
+                        
+                        if turbomail.provider:
+                                headers.extend([
+                                                ('X-TurboMail-Provider', "%s <%s>" % (turbomail.provider.name, turbomail.provider.url)),
+                                                ('X-TurboMail-Provider-Version', turbomail.provider.version),
+                                        ])
+                        
+                        if turbomail.manager:
+                                headers.extend([
+                                                ('X-TurboMail-Manager', "%s <%s>" % (turbomail.manager.name, turbomail.manager.url)),
+                                                ('X-TurboMail-Manager-Version', turbomail.manager.version),
+                                        ])
+                
                 headers.extend(self.headers)
-
+                
                 for header in headers:
                         if isinstance(header, (tuple, list)):
@@ -188 +221 @@
                         elif isinstance(header, dict):
                                 message.add_header(**header)
-
+                
                 self._mime = message
                 self._processed = True
@@ -194 +227 @@
                 
                 return message
+        
         mime = property(mime)
         
@@ -214 +248 @@
                 self.attachments.append(part)
         
-        def embed(self, file, name):
+        def embed(self, file, name=None):
                 """Attach an on-disk image file and prepare for HTML embedding.
                 
@@ -234 +268 @@
                 if isinstance(file, (str, unicode)):
                         fp = open(file, "rb")
+                        name = os.path.basename(file)
                 else:
                         assert name is not None, "If embedding a file-like object, you must pass a custom filename."
                         fp = file
 
-                part = MIMEImage(fp.read())
+                part = MIMEImage(fp.read(), name=name)
                 fp.close()
                 
+                del part['Content-Disposition']
+                part.add_header('Content-Disposition', 'inline', filename=name)
                 part.add_header('Content-ID', '<%s>' % name)