Move send_scheduled_announcement functionality to messages/utils.py

 - Legacy-Id: 6768

Author: OleLaursen

ietf/announcements/send_scheduled.py

@@ -18,63 +18,3 @@ def doCanonicalize(self, url, content):
             return canonicalize_sitemap(content)
         else:
             return content
-
-class SendScheduledAnnouncementsTestCase(TestCase):
-    def test_send_plain_announcement(self):
-        make_test_data()
-
-        msg = Message.objects.create(
-            by=Person.objects.get(name="(System)"),
-            subject="This is a test",
-            to="test@example.com",
-            frm="testmonkey@example.com",
-            cc="cc.a@example.com, cc.b@example.com",
-            bcc="bcc@example.com",
-            body="Hello World!",
-            content_type="",
-            )
-
-        q = SendQueue.objects.create(
-            by=Person.objects.get(name="(System)"),
-            message=msg,
-            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
-            )
-
-        mailbox_before = len(outbox)
-        
-        from ietf.announcements.send_scheduled import send_scheduled_announcement
-        send_scheduled_announcement(q)
-
-        self.assertEquals(len(outbox), mailbox_before + 1)
-        self.assertTrue("This is a test" in outbox[-1]["Subject"])
-        self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)
-
-    def test_send_mime_announcement(self):
-        make_test_data()
-
-        msg = Message.objects.create(
-            by=Person.objects.get(name="(System)"),
-            subject="This is a test",
-            to="test@example.com",
-            frm="testmonkey@example.com",
-            cc="cc.a@example.com, cc.b@example.com",
-            bcc="bcc@example.com",
-            body='--NextPart\r\n\r\nA New Internet-Draft is available from the on-line Internet-Drafts directories.\r\n--NextPart\r\nContent-Type: Message/External-body;\r\n\tname="draft-huang-behave-bih-01.txt";\r\n\tsite="ftp.ietf.org";\r\n\taccess-type="anon-ftp";\r\n\tdirectory="internet-drafts"\r\n\r\nContent-Type: text/plain\r\nContent-ID:     <2010-07-30001541.I-D@ietf.org>\r\n\r\n--NextPart--',
-            content_type='Multipart/Mixed; Boundary="NextPart"',
-            )
-
-        q = SendQueue.objects.create(
-            by=Person.objects.get(name="(System)"),
-            message=msg,
-            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
-            )
-        
-        mailbox_before = len(outbox)
-        
-        from ietf.announcements.send_scheduled import send_scheduled_announcement
-        send_scheduled_announcement(q)
-
-        self.assertEquals(len(outbox), mailbox_before + 1)
-        self.assertTrue("This is a test" in outbox[-1]["Subject"])
-        self.assertTrue("--NextPart" in outbox[-1].as_string())
-        self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)

ietf/announcements/tests.py

@@ -6,5 +6,5 @@
 
 urlpatterns = patterns('',
     (r'^nomcom/$', 'ietf.announcements.views.nomcom'),
-    (r'^nomcom/(?P<object_id>\d+)/$', 'ietf.announcements.views.message_detail'))
+    (r'^nomcom/(?P<object_id>\d+)/$', 'ietf.announcements.views.message_detail'),
 )

ietf/announcements/urls.py

@@ -10,29 +10,24 @@ management.setup_environ(settings)
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 
-from ietf.announcements.send_scheduled import *
-from django.db.models import Q
-
 if len(sys.argv) != 2 or sys.argv[1] not in ('all', 'rsync', 'specific'):
-    print "USAGE: %s <all | rsync | specific>" % os.path.basename(__file__)
+    print "USAGE: %s <all | specific>" % os.path.basename(__file__)
     print "'all' means all not sent"
-    print "'rsync' means all not sent where to-be-sent-date is null"
     print "'specific' means all not sent that are due to be sent"
     sys.exit(1)
 
+from ietf.message.utils import send_scheduled_message_from_send_queue
+from ietf.message.models import SendQueue
+
 mode = sys.argv[1]
 
 now = datetime.datetime.now()
 
-from ietf.message.models import SendQueue
 needs_sending = SendQueue.objects.filter(sent_at=None).select_related("message")
-if mode == "rsync":
-    needs_sending = needs_sending.filter(send_at=None)
-elif mode == "specific":
+if mode == "specific":
     needs_sending = needs_sending.exclude(send_at=None).filter(send_at__lte=now)
 
 for s in needs_sending:
-    send_scheduled_announcement(s)
+    send_scheduled_message_from_send_queue(s)
 
-    subject = s.message.subject
-    syslog.syslog(u'Sent scheduled announcement %s "%s"' % (s.id, subject))
+    syslog.syslog(u'Sent scheduled message %s "%s"' % (s.id, s.message.subject))

ietf/bin/send-scheduled-mail

@@ -1,9 +1,14 @@
+import re, datetime, email
+
+from django.conf import settings
+
+from ietf.utils.mail import send_mail_text, send_mail_mime
 from ietf.message.models import Message
 
-def infer_message(s):
-    from email import message_from_string
+first_dot_on_line_re = re.compile(r'^\.', re.MULTILINE)
 
-    parsed = message_from_string(s.encode("utf-8"))
+def infer_message(s):
+    parsed = email.message_from_string(s.encode("utf-8"))
 
     m = Message()
     m.subject = parsed.get("Subject", "").decode("utf-8")
@@ -14,3 +19,32 @@ def infer_message(s):
     m.body = parsed.get_payload().decode("utf-8")
 
     return m
+
+def send_scheduled_message_from_send_queue(send_queue):
+    message = send_queue.message
+    
+    # for some reason, the old Perl code base substituted away . on line starts
+    body = first_dot_on_line_re.sub("", message.body)
+    
+    extra = {}
+    if message.reply_to:
+        extra['Reply-To'] = message.reply_to
+
+    # announcement.content_type can contain a case-sensitive parts separator,
+    # so we need to keep it as is, not lowercased, but we want a lowercased
+    # version for the coming comparisons.
+    content_type_lowercase = message.content_type.lower()
+    if not content_type_lowercase or 'text/plain' in content_type_lowercase:
+        send_mail_text(None, message.to, message.frm, message.subject,
+                       body, cc=message.cc, bcc=message.bcc)
+    elif 'multipart' in content_type_lowercase:
+        # make body a real message so we can parse it
+        body = ("MIME-Version: 1.0\r\nContent-Type: %s\r\n" % message.content_type) + body
+        
+        msg = email.message_from_string(body.encode("utf-8"))
+        send_mail_mime(None, message.to, message.frm, message.subject,
+                       msg, cc=message.cc, bcc=message.bcc)
+
+    send_queue.sent_at = datetime.datetime.now()
+    send_queue.save()
+

ietf/message/utils.py

@@ -3,7 +3,7 @@
 from django.template.loader import render_to_string
 
 from ietf.message.models import Message, SendQueue
-from ietf.announcements.send_scheduled import send_scheduled_announcement
+from ietf.message.utils import send_scheduled_message_from_send_queue
 from ietf.doc.models import DocumentAuthor
 from ietf.person.models import Person
 from ietf.secr.utils.document import get_start_date
@@ -41,7 +41,7 @@ def announcement_from_form(data, **kwargs):
     send_queue = SendQueue.objects.create(by=by,message=message)
 
     # uncomment for testing
-    send_scheduled_announcement(send_queue)
+    send_scheduled_message_from_send_queue(send_queue)
 
     return message