Ticket #247: 2longfilename.2.patch

email2trac.

@@ -75 +75 @@
 import logging.handlers
 import UserDict
 import tempfile
+import trans
 
 from datetime import tzinfo, timedelta, datetime
 from stat import *
@@ -229 +230 @@
 
         self.system = None
 
+########## Rus2Eng converter filename #######################################################
+    def FixFileName(self,filename):
+        filename = filename.replace(' ', '_') 
+        return filename.encode('trans')
+
 ########## Email Header Functions ###########################################################
 
     def spam(self, message):
@@ -451 +457 @@
                 
             (original, filename, part) = item
 
+# Convert rus UTF-8 to eng filename
+            filename = self.FixFileName(filename)
+
             n = n + 1
             print 'part%d: Content-Type: %s' % (n, part.get_content_type())
-        
+
             s = 'part%d: filename: %s' %(n, filename)
             self.print_unicode(s)
     
@@ -863 +872 @@
                 #
                 if tkt['status'] in ['closed']:
                     workflow = self.parameters.workflow
+                    # Fix situation with reopen ticket via e-mail
+                    tkt['status'] = 'reopened'
+                    tkt['resolution'] = ''
                 else:   
                     workflow = None
 
@@ -1171 +1183 @@
 
     def attach_attachments(self, message_parts, update=False):
         '''
-        save any attachments as files in the ticket's directory
+        save any attachments as files in the ticket`s directory
         '''
         self.logger.debug('function attach_attachments()')
 
@@ -1194 +1206 @@
                 
             (original, filename, part) = item
 
+# Convert rus UTF-8 to eng filename
+            filename = self.FixFileName(filename)
+
             ## We have to determine the size so we use this temporary solution. we must escape it
             #  else we get UnicodeErrors. 
             #
@@ -1830 +1845 @@
             ## Check content type
             # 
             if content_type in self.STRIP_CONTENT_TYPES:
-                self.logger.debug("\t A %s attachment named '%s' was skipped" %(content_type, part.get_filename()))
+                self.logger.debug("\t A %s attachment named '%s' was skipped" %(content_type, self.FixFileName(part.get_filename()) ))
                 continue
 
             ## Catch some mulitpart execptions
@@ -1863 +1878 @@
             if not content_type in ['text/plain']:
 
                 if self.parameters.debug:
-                    s = '\t Filename: %s' % part.get_filename()
+                    s = '\t Filename: %s' % self.FixFileName(part.get_filename())
                     self.print_unicode(s)
 
                 ## First try to use email header function to convert filename.
                 #  If this fails the use the plain filename 
                 #
                 try:
-                    filename = self.email_to_unicode(part.get_filename())
+                    filename = self.email_to_unicode(self.FixFileName(part.get_filename()))
                 except UnicodeEncodeError, detail:
-                    filename = part.get_filename()
+                    filename = self.FixFileName(part.get_filename())
 
                 message_parts.append((filename, part))
 
@@ -1960 +1975 @@
                 
             (filename, part) = item
 
+# Convert rus UTF-8 to eng filename
+            filename = self.FixFileName(filename)
+
             ## If filename = None, use a default one
             #
             if filename in [ 'None']:
@@ -2060 +2078 @@
 
             (original, filename, part) = part
             inline = self.inline_part(part)
+# Convert rus UTF-8 to eng filename
+            filename = self.FixFileName(filename)
 
             ## Skip generation of attachment link if html is converted to text
             #