Changeset 348

Timestamp:

04/12/10 18:04:24 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• added some code that will replace the / and \ chars for attachments filenames with _. These chars are forbidden for Unix/Windows? environments. Alse when something goes wrong with an attachment. The error is displayed in the changelog of the ticket, see #196

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (5 diffs)

trunk/ChangeLog

@@ -1 +1 @@
 2010-XX-XX
+  * Re-enabled some code that normalized the filenames for attachment
 
 

trunk/email2trac.py.in

@@ -505 +505 @@
                         n = n + 1
                         print 'TD: part%d: Content-Type: %s' % (n, part.get_content_type())
-                        print 'TD: part%d: filename: %s' % (n, part.get_filename())
-
-                        part_file = os.path.join(self.TMPDIR, part.get_filename())
+                        print 'TD: part%d: filename: %s' % (n, filename)
+
+                        ## Forbidden chars
+                        #
+                        filename = filename.replace('\\', '_')
+                        filename = filename.replace('/', '_') 
+        
+
+                        part_file = os.path.join(self.TMPDIR, filename)
                         print 'TD: writing part%d (%s)' % (n,part_file)
 
@@ -800 +806 @@
                 body_text = self.body_text(message_parts)
 
+                if self.VERSION  == 0.9:
+                        error_with_attachments = self.attach_attachments(message_parts, True)
+                else:
+                        error_with_attachments = self.attach_attachments(message_parts)
+
                 if body_text.strip() or update_fields or self.properties: 
                         if self.DRY_RUN:
                                 print 'DRY_RUN: tkt.save_changes(self.author, body_text, ticket_change_number) ', self.author, cnum
                         else:
+                                if error_with_attachments:
+                                        body_text = '%s\\%s' %(error_with_attachments, body_text)
+                                
                                 tkt.save_changes(self.author, body_text, when, None, str(cnum))
                         
 
-                if self.VERSION  == 0.9:
-                        error_with_attachments = self.attach_attachments(message_parts, True)
-                else:
-                        error_with_attachments = self.attach_attachments(message_parts)
+                #if self.VERSION  == 0.9:
+                #       error_with_attachments = self.attach_attachments(message_parts, True)
+                #else:
+                #       error_with_attachments = self.attach_attachments(message_parts)
 
                 if self.notification and not spam:
@@ -1047 +1061 @@
                                 att.description = self.email_to_unicode('Added by email2trac')
 
-                        att.insert(filename, fd, file_size)
-
-                        #except  util.TracError, detail:
-                        #       print detail
+                        try:
+                                att.insert(filename, fd, file_size)
+                        except OSError, detail:
+                                status = '%s\nFilename %s could not be saved, problem: %s' %(status, filename, detail)
 
                         # Remove the created temporary filename
@@ -1486 +1500 @@
                                 filename = '%s%s' % (filename, ext)
 
-                        ## Discard relative paths in attachment names
-                        #
-                        filename = filename.replace('\\', '/').replace(':', '/') 
-                        filename = os.path.basename(filename)
+                        ## Discard relative paths for windows/unix in attachment names
+                        #
+                        #filename = filename.replace('\\', '/').replace(':', '/') 
+                        filename = filename.replace('\\', '_')
+                        filename = filename.replace('/', '_') 
 
                         #
@@ -1496 +1511 @@
                         # Check python version and then try it
                         #
-                        if sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 3):
-                                try:
-                                        filename = unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8')  
-                                except TypeError:
-                                        pass
+                        #if sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 3):
+                        #       try:
+                        #               filename = unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8')  
+                        #       except TypeError:
+                        #               pass
 
                         # Make the filename unique for this ticket