Ticket #379: email2trac_ignore_attachments.diff

c:/trac/email2trac.

@@ -319 +319 @@
 
         return False
 
+    def email_attachment_ignored(self, attachment_name):
+        """
+        This function will check if the attachment should be ignored.
+        """ 
+        self.logger.debug('function email_attachment_acl: %s' % attachment_name)
+        
+        try:
+            ignored_attachments = self.parameters['ignored_attachments']
+            
+            # Check empty string
+            #
+            if not ignored_attachments:
+                return false #not ignored
+            
+        except KeyError, detail:
+            self.logger.debug('\t %s not defined, all messages are allowed.' % ('ignored_attachments'))
+
+            return false #not ignored
+
+        ignored_attachments = string.split(ignored_attachments, ',')
+        
+        for entry in ignored_attachments:
+            if attachment_name == entry:
+                return True #ignore this attachment
+
     def email_header_txt(self, m):
         """
         Display To and CC addresses in description field
@@ -1385 +1410 @@
                 
             (original, filename, part) = item
 
+            # Skip black-listed attachments
+            if self.email_attachment_ignored(filename):
+                continue
+            
             ## We have to determine the size so we use this temporary solution. 
             #
             path, fd =  util.create_unique_file(os.path.join(self.parameters.tmpdir, 'email2trac_tmp.att'))
@@ -2334 +2363 @@
 
             (original, filename, part) = part
             inline = self.inline_part(part)
+
+            if self.email_attachment_ignored(filename):
+                continue
 
             ## Skip generation of attachment link if html is converted to text
             #