Changeset 606 for trunk

Timestamp:

08/30/12 14:31:39 (12 years ago)

Author:

bas

Message:

added strip_signature_regex option, closes #296, #155

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (2 diffs)
• msg.txt (modified) (1 diff)

trunk/ChangeLog

@@ -34 +34 @@
     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
+
+  * Added a new option 'strip_signature_regex', default value: 
+      * '^-----Original Message-----$|^-- $'
+    This will strip signatures form the email messages. People can set their own regular
+    expressions, closes #296, #155
+    Author: steverweber add gmail dot com
     Appplied by: Bas van der Vlies
 

trunk/email2trac.py.in

@@ -220 +220 @@
             self.parameters.subject_field_separator = self.parameters.subject_field_separator.strip()
 
+        if not self.parameters.strip_signature_regex:
+            self.parameters.strip_signature_regex = '^-----Original Message-----$|^-- $'
+
+
         self.trac_smtp_from = self.get_config('notification', 'smtp_from')
         self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain')
@@ -1875 +1879 @@
 
         body = []
+
+        STRIP_RE = re.compile( self.parameters.strip_signature_regex )
         for line in text.splitlines():
-            if line == '-- ':
+
+            match = STRIP_RE.match(line)
+            if match:
+                self.logger.debug('\t"%s "  matched, skiping rest of message' %line)
                 break 
+
             body.append(line)
 

trunk/msg.txt

@@ -29 +29 @@
 
 -- 
---
 ********************************************************************
 *                                                                  *