Changeset 604

Timestamp:

08/30/12 13:55:54 (12 years ago)

Author:

bas

Message:

applied and modified patch to skip stripping of signatures and quotes, closes #192

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (5 diffs)

trunk/ChangeLog

@@ -30 +30 @@
     Reported by: Anonymous
     Fixed by: Bas van der Vlies
+
+  * Added a new option 'only_strip_on_update', default value is False. Only call the functions
+    strip_quotes and strip_signature for ticket updates, closes #192
+    Requested by, Patch:  Konstantin Ryabitsev <icon add mricon dot com>
+    Appplied by: Bas van der Vlies
 
 2.5.0 

trunk/email2trac.py.in

@@ -220 +220 @@
             self.parameters.subject_field_separator = self.parameters.subject_field_separator.strip()
 
+        #if self.parameters.only_strip_on_update == None:
+        #    self.parameters.only_strip_on_update == False:
+        #else:
+        #    self.parameters.only_strip_on_update == True:
+
         self.trac_smtp_from = self.get_config('notification', 'smtp_from')
         self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain')
@@ -979 +984 @@
             ## Not a valid ticket
             #
+            self.logger.info("\tCreating a new ticket, ticket id: %s does not exists" %id)
             self.id = None
             return False
@@ -1240 +1246 @@
 
 
-        message_parts = self.get_message_parts(msg)
+        message_parts = self.get_message_parts(msg, True)
 
         ## Must we update some ticket fields properties via body_text
@@ -2008 +2014 @@
         return part.get_param('inline', None, 'Content-Disposition') == '' or not part.has_key('Content-Disposition')
 
-    def get_message_parts(self, msg):
+    def get_message_parts(self, msg, new_email=False):
         """
         parses the email message and returns a list of body parts and attachments
@@ -2104 +2110 @@
             if self.parameters.reflow and not self.parameters.verbatim_format and format == 'flowed':
                 body_text = self.reflow(body_text, delsp == 'yes')
-    
-            if self.parameters.strip_signature:
-                body_text = self.strip_signature(body_text)
-
-            if self.parameters.strip_quotes: 
-                body_text = self.strip_quotes(body_text)
+
+            if new_email and self.parameters.only_strip_on_update:
+                self.logger.debug('Skip signature/quote stripping for new messages')
+            else:
+                if self.parameters.strip_signature:
+                    body_text = self.strip_signature(body_text)
+
+                if self.parameters.strip_quotes: 
+                    body_text = self.strip_quotes(body_text)
 
             if self.parameters.inline_properties: