Changeset 631

Timestamp:

06/21/13 17:41:13 (10 years ago)

Author:

bas

Message:

We can now support name+id@… addresses:

• recipient_delimiter: +

wrote a simple notication function that sets the reply to field of a mail to: name+id@…

• notification_replyto_rewrite: 1

For each bug there will be an uniqye address

Still some work to be done:

see #297

Location:

trunk

Files:

• email2trac.py.in (modified) (6 diffs)
• msg.txt (modified) (2 diffs)

trunk/email2trac.py.in

@@ -78 +78 @@
 sender_email = None
 
+# This is to for the function set_reply_to_fiedl
+REPLY_TO_ADDRESS = None
+
+
+
 class SaraDict(UserDict.UserDict):
     def __init__(self, dictin = None):
@@ -222 +227 @@
         self.trac_smtp_from = self.get_config('notification', 'smtp_from')
         self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain')
+        self.smtp_replyto = self.get_config('notification', 'smtp_replyto')
 
 
@@ -1779 +1785 @@
         self.logger.info('subject: %s' %repr(subject))
 
+        ## First try the new method and then fall back to old method
+        #
+        if not self.parse_delivered_to_field(m, subject, spam_msg):
+            self.parse_subject_field(m, subject, spam_msg)
+
+    def parse_delivered_to_field(self, m, subject, spam_msg):
+        """
+        """
+        self.logger.debug('function parse_delivered_to_field')
+
         ## Ticket id is in Delivered-To Field. Trac notify must send this
-        #
-        #try:
-        #    print self.parameters.project_name
-        #    print 'Delivered To', m['Delivered-To']
-        #    print self.parameters.to_parse_address_delimiter
-        #    id = m['Delivered-To'].split(self.parameters.to_parse_address_delimiter)[1]
-        #    print id
-        #    id = id.split('@')[0]
-        #    print id
-#
-#        except KeyError, detail:
-#            pass
-
+        #  eg: is+390@surfsara.nl
+        try:
+
+            #print self.parameters.project_name
+            self.logger.debug('Delivered To: %s' %m['Delivered-To'])
+
+            id = m['Delivered-To']
+            id = id.split(self.parameters.recipient_delimiter)[1]
+            id = id.split('@')[0]
+
+            self.logger.debug('\t Found ticket id: %s' %id)
+
+            if not self.ticket_update(m, id, spam_msg):
+                return False
+
+        except KeyError, detail:
+            pass
+        except IndexError, detail:
+            pass
+
+        return False
+
+    def parse_subject_field(self, m, subject, spam_msg):
+        """
+        """
+        self.logger.debug('function parse_subject_header')
 
         ## [hic] #1529: Re: LRZ
@@ -1801 +1830 @@
             |(?P<reply>(?P<id>[#][\d]+)(?P<fields>\?.*)?:)
             '''
+
         ## Check if  FullBlogPlugin is installed
         #
@@ -2395 +2425 @@
             Email2TracNotification.Notify.notify = AlwaysNotifyReporter
 
+        
+        if self.parameters.notification_replyto_rewrite:
+            global REPLY_TO_ADDRESS
+            dummy = self.smtp_replyto.split('@')
+            
+            if len(dummy) > 1:
+                REPLY_TO_ADDRESS = '%s+%s@%s' %(dummy[0], self.id, dummy[1])
+            else:
+                REPLY_TO_ADDRESS = '%s+%s' %(dummy[0], self.id)
+
+            import trac.notification as Email2TracNotification
+            Email2TracNotification.Notify.notify = set_reply_to_field
+
         if self.parameters.dry_run  :
                 self.logger.info('DRY_RUN: self.notify(tkt, True) reporter = %s' %tkt['reporter'])
@@ -2453 +2496 @@
         if not sender_email in torcpts:
             torcpts.append(sender_email)
+
+    #self.replyto_email = "bas.van.der.vlies@gmail.com"
+
+    self.begin_send()
+    self.send(torcpts, ccrcpts)
+    self.finish_send()
+
+def set_reply_to_field(self, resid):
+    """
+    Copy of def notify() to manipulate recipents to always include reporter for the
+    notification.
+    """
+    print sender_email, resid, REPLY_TO_ADDRESS
+    (torcpts, ccrcpts) = self.get_recipients(resid)
+    
+    self.replyto_email = '%s' %(REPLY_TO_ADDRESS)
+    print self.replyto_email
 
     self.begin_send()

trunk/msg.txt

@@ -1 @@
-From basv@sara.nl  Wed Mar  8 15:29:17 2006
+From bas.vandervlies@surfsara.nl  Wed Mar  8 15:29:17 2006
 Return-Path: <basv@sara.nl>
 X-Original-To: test@subtrac.sara.nl
@@ -28 +28 @@
 Test1234
 
--- 
-********************************************************************
-*                                                                  *
-*  Bas van der Vlies                     e-mail: basv@sara.nl      *
-*  SARA - Academic Computing Services    phone:  +31 20 592 8012   *
-*  Kruislaan 415                         fax:    +31 20 6683167    *
-*  1098 SJ Amsterdam                                               *
-*                                                                  *
-********************************************************************
+---
+As of 1 January 2013, SARA has a new name: SURFsara.
+
+Bas van der Vlies
+| Operations, Support & Development | SURFsara | Science Park 140 | 1098 XG  Amsterdam
+| T +31 (0) 20 592 30 00 | bas.vandervlies@surfsara.nl | www.surfsara.nl |
 
 --------------070800080005060203060809