Changeset 191 for trunk

Timestamp:

10/11/07 12:01:11 (17 years ago)

Author:

bas

Message:

email2trac.py.in, ChangeLog?, email2trac.conf:

• Added strip_quotes function. Author: nicolasm at opera dot com

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.conf (modified) (2 diffs)
• email2trac.py.in (modified) (7 diffs)

trunk/ChangeLog

@@ -8 +8 @@
           disable the syslog functionality.
           Author     : michael.th add gmx dot net 
-          
+
+        * Added strip_quotes function, default settings:
+                strip_quotes: <int> (default: 0) 
+                mail_quote: <quote chars> (default: "> ")
+          Author     : nicolasm @ opera dot com
 
 2007-07-18

trunk/email2trac.conf

@@ -7 +7 @@
 mailto_link: 0
 umask: 022
-email_comment: >
 email_header: 0
 trac_version: 0.10
@@ -15 +14 @@
 verbatim_format: 1
 strip_signature: 0
+email_quote: >
+strip_quotes: 0
 
 

trunk/email2trac.py.in

@@ -170 +170 @@
                         self.SPAM_LEVEL = 0
 
-                if parameters.has_key('email_comment'):
-                        self.comment = str(parameters['email_comment'])
+                if parameters.has_key('email_quote'):
+                        self.EMAIL_QUOTE = str(parameters['email_quote'])
+                else:   
+                        self.EMAIL_QUOTE = '> '
 
                 if parameters.has_key('email_header'):
@@ -207 +209 @@
                 else:
                         self.STRIP_SIGNATURE = 0
+
+                if parameters.has_key('strip_quotes'):
+                        self.STRIP_QUOTES = int(parameters['strip_quotes'])
+                else:
+                        self.STRIP_QUOTES = 0
 
                 if parameters.has_key('use_textwrap'):
@@ -223 +230 @@
                         self.TMPDIR = os.path.normcase(str(parameters['tmpdir']))
 
-        # X-Spam-Score: *** (3.255) BAYES_50,DNS_FROM_AHBL_RHSBL,HTML_
-        # Note if Spam_level then '*' are included
+
         def spam(self, message):
+                """
+                # X-Spam-Score: *** (3.255) BAYES_50,DNS_FROM_AHBL_RHSBL,HTML_
+                # Note if Spam_level then '*' are included
+                """
                 if message.has_key('X-Spam-Score'):
                         spam_l = string.split(message['X-Spam-Score'])
@@ -233 +243 @@
                                 return 'Spam'
 
-                elif message.has_key('X-Virus-found'):                  # treat virus mails as spam
+                # treat virus mails as spam
+                #
+                elif message.has_key('X-Virus-found'):                  
                         return 'Spam'
 
                 return self.get_config('ticket', 'default_component') 
+
 
         def blacklisted_from(self):
@@ -695 +708 @@
                 return ('\n'.join(body))
 
+        def strip_quotes(self, text): 
+        """
+        Strip quotes from message by Nicolas Mendoza
+        """
+        body = [] 
+        for line in text.splitlines():
+                if line.startswith(self.EMAIL_QUOTE): 
+                        continue
+                body.append(line)
+
+        return ('\n'.join(body))
+
 
         def wrap_text(self, text, replace_whitespace = False):
                 """
-                Will break a lines longer then given length into several small lines of size 
-                given length
+                Will break a lines longer then given length into several small 
+                lines of size given length
                 """
                 import textwrap
@@ -746 +771 @@
                                         body_text = self.strip_signature(body_text)
 
+                                if self.STRIP_QUOTES: 
+                                        body_text = self.strip_quotes(body_text)
+
                                 if self.USE_TEXTWRAP:
                                         body_text = self.wrap_text(body_text)
@@ -815 +843 @@
                 except Exception, e:
                         print 'TD: Failure sending notification on creation of ticket #%s: %s' %(tkt['id'], e)
-
-        def mail_line(self, str):
-                return '%s %s' % (self.comment, str)
-
 
         def html_mailto_link(self, subject, id, body):