Changeset 309

Timestamp:

02/02/10 16:39:19 (14 years ago)

Author:

bas

Message:

email2trac.py.in:

• added inline properties patch. To set ticket fields within an email, eg:

@owner: bas

Will set the owner of the ticket to bas, closes #171

• Display a warning if it is a blog message and the plugin is not installed, see #175

File:

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

trunk/email2trac.py.in

@@ -227 +227 @@
                         self.STRIP_QUOTES = 0
 
+                self.properties = dict()
+                if parameters.has_key('inline_properties'):
+                        self.INLINE_PROPERTIES = int(parameters['inline_properties'])
+                else:
+                        self.INLINE_PROPERTIES = 0
+
                 if parameters.has_key('use_textwrap'):
                         self.USE_TEXTWRAP = int(parameters['use_textwrap'])
@@ -529 +535 @@
 
         def save_email_for_debug(self, message, tempfile=False):
+
                 if tempfile:
                         import tempfile
@@ -544 +551 @@
                 except OSError:
                         pass
+
+                message_parts = self.get_message_parts(message)
+                message_parts = self.unique_attachment_names(message_parts)
+                body_text = self.body_text(message_parts)
+                self.debug_body(body_text, True)
+                self.debug_attachments(message_parts)
 
         def str_to_dict(self, s):
@@ -725 +738 @@
                                 tkt['resolution'] = ''
 
-                # Must we update some ticket fields properties
+                # Must we update some ticket fields properties via subjectline
                 #
                 if update_fields:
@@ -733 +746 @@
                 message_parts = self.unique_attachment_names(message_parts)
 
+                # Must we update some ticket fields properties via body_text
+                #
+                if self.properties:
+                                self.update_ticket_fields(tkt, self.properties)
+
                 if self.EMAIL_HEADER:
                         message_parts.insert(0, self.email_header_txt(m))
@@ -738 +756 @@
                 body_text = self.body_text(message_parts)
 
-                if body_text.strip() or update_fields:
+                if body_text.strip() or update_fields or self.properties: 
                         if self.DRY_RUN:
                                 print 'DRY_RUN: tkt.save_changes(self.author, body_text, ticket_change_number) ', self.author, cnum
@@ -845 +863 @@
                         head = self.email_header_txt(msg)
 
-                                        
                 message_parts = self.get_message_parts(msg)
+
+                # Must we update some ticket fields properties via body_text
+                #
+                if self.properties:
+                                self.update_ticket_fields(tkt, self.properties)
+
                 if self.DEBUG:
                         print 'TD: self.get_message_parts ',
@@ -947 +970 @@
                         blog.create_post(req, post, self.author, u'Created by email2trac', False)
 
+        def save_message_for_debug(self):
+                """
+                Save the messages. So we can use it for debug purposes
+                """
+                
 
         def parse(self, fp):
@@ -962 +990 @@
 
                 if self.DEBUG > 1:        # save the entire e-mail message text
-                        message_parts = self.get_message_parts(m)
-                        message_parts = self.unique_attachment_names(message_parts)
                         self.save_email_for_debug(m, True)
-                        body_text = self.body_text(message_parts)
-                        self.debug_body(body_text, True)
-                        self.debug_attachments(message_parts)
 
                 self.db = self.env.get_db_cnx()
@@ -1030 +1053 @@
 
                 if result:
-                        if result.group('blog') and blog_enabled:
-                                self.blog(result.group('blog_id'))
+                        if result.group('blog'):
+                                if blog_enabled:
+                                        self.blog(result.group('blog_id'))
+                                else:
+                                        if self.DEBUG:
+                                                print "Fullblog plugin is not installed"
+                                                return
 
                         # update ticket + fields
@@ -1114 +1142 @@
                 return ('\n'.join(body))
 
+        def inline_properties(self, text): 
+                """
+                Parse text if we use inline keywords to set ticket fields
+                """
+                if self.DEBUG:
+                        print 'TD: inline_properties function'
+
+                properties = dict()
+                body = list()
+
+                INLINE_EXP = re.compile('\s*[@]\s*([a-zA-Z]+)\s*:(.*)$')
+
+                for line in text.splitlines():
+                        match = INLINE_EXP.match(line)
+                        if match:
+                                print match.groups()
+                                keyword, value = match.groups()
+                                self.properties[keyword] = value.strip()
+                        else:
+                                body.append(line)
+                                
+                return '\n'.join(body)
+
+
         def wrap_text(self, text, replace_whitespace = False):
                 """
@@ -1144 +1196 @@
                 body parts are returned as strings, attachments are returned as tuples of (filename, Message object)
                 """
-                message_parts = []
+                message_parts = list()
         
                 ALTERNATIVE_MULTIPART = False
@@ -1212 +1264 @@
                                 if self.STRIP_QUOTES: 
                                         body_text = self.strip_quotes(body_text)
+
+                                if self.INLINE_PROPERTIES: 
+                                        body_text = self.inline_properties(body_text)
 
                                 if self.USE_TEXTWRAP: