Changeset 2:108a82defd3e in mailjam for postman/mta.py

Timestamp:

May 15, 2012, 2:29:03 AM (12 years ago)

Author:

Francisco de Borja Lopez Rio <borja@…>

Branch:

default

Phase:

public

Message:

Fixed some bugs in the models and mta modules

Added tests for the mta module, including a dummy email that is used for
those tests.

Added an initial version of the Postman class (inside the daemon module). This
class will handle the main execution of the postman daemon, the manager
that will take care of mailing lists management.

Added the structure of folders needed to store json files associated with a given
postman instance.

File:

• postman/mta.py (modified) (1 diff)

postman/mta.py

@@ -8 +8 @@
 class Sendmail():
     
-    def __init__(self, mailing_list):
+    def __init__(self, mailing_list=None):
         if not isinstance(mailing_list, MailingList):
             raise ValueError(mailing_list, ' is not a valid mailing list')
         self.mailing_list = mailing_list
         self.suscriptors = self.mailing_list.members_addresses
-        self.reply_address = self.mailing_list.address
+        self.reply_to = self.mailing_list.address
+        self.raw_email = None
         self.queue = []
         self.archive = self.mailing_list.config.get('archive',
-                                                    config.storage_path)
+                                                    config.archive_path)
         
-    def get_raw_email():
+    def get_raw_email(self):
         try:        
-            raw_email = sys.stdin.read()
+            self.raw_email = sys.stdin.read()
         except:
             raise IOError('Can not get a valid email from stdin')
-        return raw_email
+        return self.raw_email
 
-    def save_raw_email():
+    def save_raw_email(self):
+        if not self.raw_email:
+            # FIXME: perhaps a while loop here, with some maximum recursion
+            # check, would be nice here
+            self.get_raw_email
         filename = os.path.join(self.archive,
                                 datetime.today().strftime('%Y%d%m%H%M%S%f'))
         tmpfile = file(filename, 'w')
-        tmpfile.write(raw_email)
+        tmpfile.write(self.raw_email)
         tmpfile.close()
         self.queue.append(filename)
 
-    def send_email():
-        if not self.queue:
-            raise ValueError('The emails queue is empty')
-        next_email = self.queue.pop()
-        email_file = file(next_email, 'r')
-        email_data = email.message_from_file(email_file)
-        email_file.close()
+    def send_email(self):
+        if self.queue:
+            next_email = self.queue.pop()
+            email_file = file(next_email, 'r')
+            email_data = email.message_from_file(email_file)
+            email_file.close()
 
-        email_data['Reply-to'] = self.reply_address
+            email_data['Reply-to'] = self.reply_to
 
-        smtp_conn = smtplib.SMTP()
-        smtp_conn.connect()
-        smtp_conn.sendmail(email_data['From'], self.suscriptors,
-                           email_data.as_string())
-        smtp_conn.close()        
+            smtp_conn = smtplib.SMTP()
+            smtp_conn.connect()
+            smtp_conn.sendmail(email_data['From'], self.suscriptors,
+                               email_data.as_string())
+            smtp_conn.close()
+
+    def run(self):
+        self.get_raw_email()
+        self.save_raw_email()
+        self.send_email()