Changeset 262 for trunk/email2trac.py.in

Timestamp:

04/08/09 16:47:40 (15 years ago)

Author:

bas

Message:

closes #130

File:

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

trunk/email2trac.py.in

@@ -525 +525 @@
                 Transfrom a str of the form [<key>=<value>]+ to dict[<key>] = <value>
                 """ 
-                # Skip the last ':' character
-                #
-                fields = string.split(str[:-1], ',')
+
+                fields = string.split(str, ',')
 
                 result = dict()
                 for field in fields:
                         try: 
-                                index, value = string.split(field,'=')
+                                index, value = string.split(field, '=')
 
                                 # We can not change the description of a ticket via the subject
@@ -619 +618 @@
                 try:
                         id, keywords = string.split(id, '?')
+
+                        # Skip the last ':' character
+                        #
+                        keywords = keywords[:-1]
                         update_fields = self.str_to_dict(keywords)
 
@@ -766 +769 @@
 
 
-        def new_ticket(self, msg, spam):
+        def new_ticket(self, msg, subject, spam, set_fields = None):
                 """
                 Create a new ticket
@@ -787 +790 @@
                         tkt['summary'] = u'(No subject)'
                 else:
-                        tkt['summary'] = self.email_to_unicode(msg['Subject'])
+                        tkt['summary'] = self.email_to_unicode(subject)
 
                 self.set_reply_fields(tkt, msg)
+
+                if set_fields:
+                        rest, keywords = string.split(set_fields, '?')
+
+                        if keywords:
+                                update_fields = self.str_to_dict(keywords)
+                                self.update_ticket_fields(tkt, update_fields)
 
                 # produce e-mail like header
@@ -936 +946 @@
                         self.notification = 0
 
-                print self.get_config('components', 'tracext.google.ads.*')
-
                 # Check if  FullBlogPlugin is installed
                 #
@@ -956 +964 @@
                 TICKET_RE = re.compile(r"""
                         (?P<blog>blog:(?P<blog_id>\w*))
-                        |(?P<ticket_id>[#][\d]+:)
-                        |(?P<ticket_fields>[#][\d]+\?.*?:)
+                        |(?P<new_fields>[#][?].*)
+                        |(?P<reply>[#][\d]+:)
+                        |(?P<reply_fields>[#][\d]+\?.*?:)
                         """, re.VERBOSE)
 
@@ -968 +977 @@
                         # update ticket + fields
                         #
-                        if result.group('ticket_fields') and self.TICKET_UPDATE:
-                                self.ticket_update(m, result.group('ticket_fields'), spam_msg)
+                        if result.group('reply_fields') and self.TICKET_UPDATE:
+                                self.ticket_update(m, result.group('reply_fields'), spam_msg)
 
                         # Update ticket
                         #
-                        elif result.group('ticket_id') and self.TICKET_UPDATE:
-                                self.ticket_update(m, result.group('ticket_id'), spam_msg)
+                        elif result.group('reply') and self.TICKET_UPDATE:
+                                self.ticket_update(m, result.group('reply'), spam_msg)
+
+                        # New ticket + fields
+                        #
+                        elif result.group('new_fields'):
+                                self.new_ticket(m, subject[:result.start('new_fields')], spam_msg, result.group('new_fields'))
 
                 # Create ticket
                 #
                 else:
-                        self.new_ticket(m, spam_msg)
+                        self.new_ticket(m, subject, spam_msg)
 
         def strip_signature(self, text):