Changeset 310 for trunk/email2trac.py.in

Timestamp:

02/02/10 16:53:43 (13 years ago)

Author:

bas

Message:

rearranged some code

File:

• trunk/email2trac.py.in (modified) (2 diffs)

trunk/email2trac.py.in

@@ -375 +375 @@
                 return s
 
+
+        def email_header_txt(self, m):
+                """
+                Display To and CC addresses in description field
+                """
+                s = ''
+                #if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
+                if m['To'] and len(m['To']) > 0:
+                        s = "'''To:''' %s\r\n" %(m['To'])
+                if m['Cc'] and len(m['Cc']) > 0:
+                        s = "%s'''Cc:''' %s\r\n" % (s, m['Cc'])
+
+                return  self.email_to_unicode(s)
+
+
+        def get_sender_info(self, message):
+                """
+                Get the default author name and email address from the message
+                """ 
+
+                self.email_to = self.email_to_unicode(message['to']) 
+                self.to_name, self.to_email_addr = email.Utils.parseaddr (self.email_to) 
+
+                self.email_from = self.email_to_unicode(message['from'])
+                self.email_name, self.email_addr  = email.Utils.parseaddr(self.email_from)
+
+                ## Trac can not handle author's name that contains spaces
+                #  and forbid the ticket email address as author field
+
+                if self.email_addr == self.trac_smtp_from:
+                        self.author = "email2trac"
+                else:
+                        self.author = self.email_addr
+
+                if self.IGNORE_TRAC_USER_SETTINGS:
+                        return
+
+                # Is this a registered user, use email address as search key:
+                # result:
+                #   u : login name
+                #   n : Name that the user has set in the settings tab
+                #   e : email address that the user has set in the settings tab 
+                #
+                users = [ (u,n,e) for (u, n, e) in self.env.get_known_users(self.db)
+                        if e and (e.lower() == self.email_addr.lower()) ]
+
+                if len(users) == 1:
+                        self.email_from = users[0][0]
+                        self.author = users[0][0]
+
+        def set_reply_fields(self, ticket, message):
+                """
+                Set all the right fields for a new ticket
+                """
+                if self.DEBUG: 
+                        print 'TD: set_reply_fields'
+
+                ## Only use name or email adress
+                #ticket['reporter'] = self.email_from
+                ticket['reporter'] = self.author
+
+
+                # Put all CC-addresses in ticket CC field
+                #
+                if self.REPLY_ALL:
+
+                        email_cc = ''
+
+                        cc_addrs = email.Utils.getaddresses( message.get_all('cc', []) )
+
+                        if not cc_addrs:
+                                return
+
+                        ## Build a list of forbidden CC addresses
+                        #
+                        #to_addrs = email.Utils.getaddresses( message.get_all('to', []) )
+                        #to_list = list()
+                        #for n,e in to_addrs:
+                        #       to_list.append(e)
+                                
+                        # Remove reporter email address if notification is 
+                        # on
+                        #
+                        if self.notification:
+                                try:
+                                        cc_addrs.remove((self.author, self.email_addr))
+                                except ValueError, detail:
+                                        pass
+
+                        for name,addr in cc_addrs:
+                
+                                ## Prevent mail loop
+                                #
+                                #if addr in to_list:
+
+                                if addr == self.trac_smtp_from:
+                                        if self.DEBUG:
+                                                print "Skipping %s mail address for CC-field" %(addr)
+                                        continue
+
+                                if email_cc:
+                                        email_cc = '%s, %s' %(email_cc, addr)
+                                else:
+                                        email_cc = addr
+
+                        if email_cc:
+                                if self.DEBUG:
+                                        print 'TD: set_reply_fields: %s' %email_cc
+
+                                ticket['cc'] = self.email_to_unicode(email_cc)
+
         def debug_body(self, message_body, tempfile=False):
                 if tempfile:
@@ -423 +534 @@
                         except OSError:
                                 pass
-
-        def email_header_txt(self, m):
-                """
-                Display To and CC addresses in description field
-                """
-                s = ''
-                #if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
-                if m['To'] and len(m['To']) > 0:
-                        s = "'''To:''' %s\r\n" %(m['To'])
-                if m['Cc'] and len(m['Cc']) > 0:
-                        s = "%s'''Cc:''' %s\r\n" % (s, m['Cc'])
-
-                return  self.email_to_unicode(s)
-
-
-        def get_sender_info(self, message):
-                """
-                Get the default author name and email address from the message
-                """ 
-
-                self.email_to = self.email_to_unicode(message['to']) 
-                self.to_name, self.to_email_addr = email.Utils.parseaddr (self.email_to) 
-
-                self.email_from = self.email_to_unicode(message['from'])
-                self.email_name, self.email_addr  = email.Utils.parseaddr(self.email_from)
-
-                ## Trac can not handle author's name that contains spaces
-                #  and forbid the ticket email address as author field
-
-                if self.email_addr == self.trac_smtp_from:
-                        self.author = "email2trac"
-                else:
-                        self.author = self.email_addr
-
-                if self.IGNORE_TRAC_USER_SETTINGS:
-                        return
-
-                # Is this a registered user, use email address as search key:
-                # result:
-                #   u : login name
-                #   n : Name that the user has set in the settings tab
-                #   e : email address that the user has set in the settings tab 
-                #
-                users = [ (u,n,e) for (u, n, e) in self.env.get_known_users(self.db)
-                        if e and (e.lower() == self.email_addr.lower()) ]
-
-                if len(users) == 1:
-                        self.email_from = users[0][0]
-                        self.author = users[0][0]
-
-        def set_reply_fields(self, ticket, message):
-                """
-                Set all the right fields for a new ticket
-                """
-                if self.DEBUG: 
-                        print 'TD: set_reply_fields'
-
-                ## Only use name or email adress
-                #ticket['reporter'] = self.email_from
-                ticket['reporter'] = self.author
-
-
-                # Put all CC-addresses in ticket CC field
-                #
-                if self.REPLY_ALL:
-
-                        email_cc = ''
-
-                        cc_addrs = email.Utils.getaddresses( message.get_all('cc', []) )
-
-                        if not cc_addrs:
-                                return
-
-                        ## Build a list of forbidden CC addresses
-                        #
-                        #to_addrs = email.Utils.getaddresses( message.get_all('to', []) )
-                        #to_list = list()
-                        #for n,e in to_addrs:
-                        #       to_list.append(e)
-                                
-                        # Remove reporter email address if notification is 
-                        # on
-                        #
-                        if self.notification:
-                                try:
-                                        cc_addrs.remove((self.author, self.email_addr))
-                                except ValueError, detail:
-                                        pass
-
-                        for name,addr in cc_addrs:
-                
-                                ## Prevent mail loop
-                                #
-                                #if addr in to_list:
-
-                                if addr == self.trac_smtp_from:
-                                        if self.DEBUG:
-                                                print "Skipping %s mail address for CC-field" %(addr)
-                                        continue
-
-                                if email_cc:
-                                        email_cc = '%s, %s' %(email_cc, addr)
-                                else:
-                                        email_cc = addr
-
-                        if email_cc:
-                                if self.DEBUG:
-                                        print 'TD: set_reply_fields: %s' %email_cc
-
-                                ticket['cc'] = self.email_to_unicode(email_cc)
 
         def save_email_for_debug(self, message, tempfile=False):