Changeset 48 for emailtotracscript

Timestamp:

02/01/06 08:58:14 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Fixed an attachment saving bug for version < 0.9

Location:

emailtotracscript/trunk

Files:

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

emailtotracscript/trunk/ChangeLog

@@ -16 +16 @@
           of the email-address (only for trac version > 0.9)
           Implemented by: Kilian Cavalotti 
+        * Fixed an error in saving attachments for version < 0.9.
+          Sometimes we got bogus attachments.
+          Fixed by: Walter de Jong
 
 2006-01-21  Bas van der Vlies <basv@sara.nl>:

emailtotracscript/trunk/email2trac.py.in

@@ -490 +490 @@
                                 filename = self.to_unicode(filename)
 
-                        if '/' in filename:
-                                filename = os.path.basename(filename)
+                        # From the trac code
+                        #
+                        filename = filename.replace('\\', '/').replace(':', '/') 
+                        filename = os.path.basename(filename)
+
+                        # We try to normalize the filename to utf-8 NFC if we can.
+                        # Files uploaded from OS X might be in NFD.
+                        #
+                        if sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 3):
+                                filename = unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8')  
 
                         url_filename = urllib.quote(filename)
 
                         if self.VERSION > 0.8:
-                                tmpfile = '/tmp/email2trac-ticket%sattachment' % str(ticket['id'])
+                                #tmpfile = '/tmp/email2trac-ticket%sattachment' % str(ticket['id'])
+                                dir = '/tmp'
                         else:
                                 dir = os.path.join(self.env.get_attachments_dir(), 'ticket', 
@@ -503 +512 @@
                                         mkdir_p(dir, 0755)
 
-                                tmpfile = os.path.join(dir, url_filename)
-
-                        f = open(tmpfile, 'wb')
+                                #tmpfile = os.path.join(dir, url_filename)
+
+                        path, fd =  util.create_unique_file(os.path.join(dir, url_filename))
+                        #f = open(tmpfile, 'wb')
                         text = part.get_payload(decode=1)
                         if not text:
                                 text = '(None)'
-                        f.write(text)
+                        fd.write(text)
+                        fd.close()
 
                         # get the filesize
                         #
-                        stats = os.lstat(tmpfile) 
+                        #stats = os.lstat(tmpfile) 
+                        stats = os.lstat(path) 
                         filesize = stats[stat.ST_SIZE]
 
@@ -519 +531 @@
                         #
                         if self.VERSION > 0.8:
-                                att = attachment.Attachment(self.env,'ticket',ticket['id'])
-                                att.insert(url_filename,f,filesize)
-                                f.close()
+                                fd = open(path)
+                                att = attachment.Attachment(self.env,' ticket', ticket['id'])
+                                att.insert(url_filename, fd, filesize)
+                                fd.close()
                         else:
                                 cursor = self.db.cursor()
@@ -626 +639 @@
                 from trac.Notify import TicketNotifyEmail
                 from trac.web.href import Href
+                from trac import util
         else:
                 from trac.Environment import Environment
@@ -631 +645 @@
                 from trac.Notify import TicketNotifyEmail
                 from trac.Href import Href
+                from trac import util
 
         env = Environment(settings['project'], create=0)