Changeset 278

Timestamp:

08/25/09 11:53:01 (14 years ago)

Author:

bas

Message:

email2trac.py.in:

• added new parameter and feature to drop the HTML version of multipart/alternative message part, closes #30 keyword: drop_alternative_html_version default is 0

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (2 diffs)
• email2trac.conf (modified) (1 diff)
• email2trac.py.in (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-XX-XX
+  * Implemented a new feature to drop the HTML version of multipart/alternative
+    message part. Such a message part containts the same info, but have are sent
+    in different formats and client can decided what version is used, closes #30
+
+    Implemented by: Bas van der Vlies
+
 2009-08-20
   * updated aclocal.m4 to support python versions 2.5 and 2.6, closes #137

trunk/debian/changelog

@@ +1 @@
+email2trac (1.0.0-1) stable; urgency=low
+
+  * Implemented a new feature to drop the HTML version of multipart/alternative
+    message part. Such a message part containts the same info, but have are sent
+    in different formats and client can decided what version is used, closes #30
+
+    Implemented by: Bas van der Vlies
+
+ -- Bas van der Vlies <basv@sara.nl>  Tue, 25 Aug 2009 11:50:40 +0200
+
 email2trac (0.90-1) stable; urgency=low
 
@@ -24 +34 @@
     Applied by: Bas van der Vlies
 
-
- * default trac version for email2trac is now updated to 0.11
+  * default trac version for email2trac is now updated to 0.11
 
  -- Bas van der Vlies <basv@sara.nl>  Thu, 04 Jun 2009 14:48:11 +0200

trunk/email2trac.conf

@@ -19 +19 @@
 ignore_trac_user_settings: 0
 black_list: MAILER-DAEMON@
+drop_alternative_html_version: 1
 
 

trunk/email2trac.py.in

@@ -230 +230 @@
                         self.REFLOW = 1
 
+                if parameters.has_key('drop_alternative_html_version'):
+                        self.DROP_ALTERNATIVE_HTML_VERSION = int(parameters['drop_alternative_html_version'])
+                else:
+                        self.DROP_ALTERNATIVE_HTML_VERSION = 0
+
                 if parameters.has_key('strip_signature'):
                         self.STRIP_SIGNATURE = int(parameters['strip_signature'])
@@ -1104 +1109 @@
                 appledouble_parts = []
 
+                ALTERNATIVE_MULTIPART = False
+
                 for part in msg.walk():
                         if self.DEBUG:
+                                print 'TD: Message part: Main-Type: %s' % part.get_content_maintype()
                                 print 'TD: Message part: Content-Type: %s' % part.get_content_type()
-                                
+
+
                         # Check whether we just finished processing an AppleDouble container
                         if part not in appledouble_parts:
                                 appledouble_parts = []
 
-                        # Special handling for BinHex attachments. Options are drop (leave out with no warning), warn (and leave out), and keep
+                        ## Check content type
+                        #
                         if part.get_content_type() == 'application/mac-binhex40':
+                                #
+                                # Special handling for BinHex attachments. Options are drop (leave out with no warning), warn (and leave out), and keep
+                                #
                                 if self.BINHEX == 'warn':
                                         message_parts.append("'''A BinHex attachment named '%s' was ignored (use MIME encoding instead).'''" % part.get_filename())
@@ -1120 +1133 @@
                                         continue
 
-                        # Special handling for AppleSingle attachments. Options are drop (leave out with no warning), warn (and leave out), and keep
-                        if part.get_content_type() == 'application/applefile' and not part in appledouble_parts:
-                                if self.APPLESINGLE == 'warn':
-                                        message_parts.append("'''An AppleSingle attachment named '%s' was ignored (use MIME encoding instead).'''" % part.get_filename())
-                                        continue
-                                elif self.APPLESINGLE == 'drop':
-                                        continue
-
-                        # Special handling for the Mac-specific part of AppleDouble attachments. Options are strip (leave out with no warning), warn (and leave out), and keep
-                        if part.get_content_type() == 'application/applefile':
-                                if self.APPLEDOUBLE == 'warn':
-                                        message_parts.append("'''The resource fork of an attachment named '%s' was removed.'''" % part.get_filename())
-                                        continue
-                                elif self.APPLEDOUBLE == 'strip':
-                                        continue
-
-                        # If we entering an AppleDouble container, set up appledouble_parts so that we know what to do with its subparts
-                        if part.get_content_type() == 'multipart/appledouble':
+                        elif part.get_content_type() == 'application/applefile':
+                                #
+                                # Special handling for the Mac-specific part of AppleDouble/AppleSingle attachments. Options are strip (leave out with no warning), warn (and leave out), and keep
+                                #
+                                
+                                if part in appledouble_parts: 
+                                        if self.APPLEDOUBLE == 'warn':
+                                                message_parts.append("'''The resource fork of an attachment named '%s' was removed.'''" % part.get_filename())
+                                                continue
+                                        elif self.APPLEDOUBLE == 'strip':
+                                                continue
+                                else:
+                                        if self.APPLESINGLE == 'warn':
+                                                message_parts.append("'''An AppleSingle attachment named '%s' was ignored (use MIME encoding instead).'''" % part.get_filename())
+                                                continue
+                                        elif self.APPLESINGLE == 'drop':
+                                                continue
+
+                        elif part.get_content_type() == 'multipart/appledouble':
+                                #
+                                # If we entering an AppleDouble container, set up appledouble_parts so that we know what to do with its subparts
+                                #
                                 appledouble_parts = part.get_payload()
                                 continue
 
-                        # Any other multipart/* is just a container for multipart messages
+                        elif part.get_content_type() == 'multipart/alternative':
+                                ALTERNATIVE_MULTIPART = True
+                                continue
+
+                        # Skip multipart containers
+                        #
                         if part.get_content_maintype() == 'multipart':
+                                if self.DEBUG:
+                                        print "TD: Skipping multipart container"
                                 continue
-
+                        
                         # Check if this is an inline part. It's inline if there is co Cont-Disp header, or if there is one and it says "inline"
                         inline = self.inline_part(part)
+
+                        # Drop HTML message
+                        if ALTERNATIVE_MULTIPART and self.DROP_ALTERNATIVE_HTML_VERSION:
+                                if part.get_content_type() == 'text/html':
+                                        if self.DEBUG:
+                                                print "TD: Skipping alternative HTML message" 
+
+                                        ALTERNATIVE_MULTIPART = False
+                                        continue
 
                         # Inline text parts are where the body is