Changeset 569 for trunk/email2trac.py.in

Timestamp:

09/13/11 16:07:06 (12 years ago)

Author:

bas

Message:

text/plain attachments are not attached when they are marked as not inline, see #270

File:

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

trunk/email2trac.py.in

@@ -1918 +1918 @@
                 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"
+            ## 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)
@@ -1931 +1932 @@
                     continue
 
+            filename = part.get_filename() 
+            s = '\t unicode filename: %s' %(filename) 
+            self.print_unicode(s) 
+            self.logger.debug('\t raw filename: %s' %repr(filename))
+
+            filename = self.check_filename_length(filename)
 
             ## Save all non plain text message as attachment
@@ -1936 +1943 @@
             if not content_type in ['text/plain']:
 
-                filename = part.get_filename()
-                
-                s = '\t unicode filename: %s' %(filename)
-                self.print_unicode(s)
-                self.logger.debug('\t raw filename: %s' %repr(filename))
-
-                # 11 Aug 2011 -> Obsolete code
-                ## First try to use email header function to convert filename.
-                #  If this fails the use the plain filename 
-                #
-                #name = part.get_filename()
-                #try:
-                #    print repr(name), len(name)
-                #    filename = self.email_to_unicode(part.get_filename())
-                #    print "Bas: ", repr(filename), len(filename)
-                #except UnicodeEncodeError, detail:
-                #    print "Bas", repr(detail)
-                #    filename = part.get_filename()
-
-                message_parts.append( (self.check_filename_length(filename), part) )
-
-                ## We van only convert html messages
+                message_parts.append( (filename, part) )
+
+                ## We only convert html messages
                 #
                 if not content_type == 'text/html':
-                    self.logger.debug('\t Appending content_type = %s' %(content_type))
+                    self.logger.debug('\t Appending %s (%s)' %(repr(filename), content_type))
                     continue
 
+
+            ## We have an text or html message
+            #
             if not inline:
-                    self.logger.debug('\t Skipping %s, not an inline messsage part' %(content_type))
+                    self.logger.debug('\t Appending %s (%s), not an inline messsage part' %(repr(filename), content_type))
+                    message_parts.append( (filename, part) )
                     continue
                 
@@ -2271 +2263 @@
     notification.
     """
+    #print sender_email, resid
     (torcpts, ccrcpts) = self.get_recipients(resid)
-
-    print torcpts, ccrcpts, sender_email
+    #print "get_recipients finished"
 
     if not tktparser.email_header_acl('notify_reporter_black_list', sender_email, False):