Changeset 528

Timestamp:

06/23/11 13:35:31 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• enhanced the save_email_for_debug() function

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (6 diffs)

trunk/ChangeLog

@@ -17 +17 @@
     Reported by: Sergey V.Levin <slevin add adriver dot ru >
     Fixed by: Bas van der Vlies & Sergey V.Levin
+
+  * enhanced save_email_for_debug(). Store also the project name in the 
+    filename and easily see the difference between the raw message and
+    the body/attachments files.
+    Author: Bas van der Vlies
 
 2.1.0 (2011-6-6)

trunk/debian/changelog

@@ +1 @@
+email2trac (2.1.2-1) stable; urgency=low
+
+  * See Changelog
+
+ -- bas van der Vlies <basv@sara.nl>  Thu, 23 Jun 2011 13:34:13 +0200
+
 email2trac (2.1.1-2) stable; urgency=low
 

trunk/email2trac.py.in

@@ -415 +415 @@
     def debug_body(self, message_body, temporary_file=False):
         if temporary_file:
-            (fd, body_file) = tempfile.mkstemp('.email2trac')
+            (fd, body_file) = tempfile.mkstemp('.body_email2trac')
             fx = os.fdopen(fd, 'wb')
         else:
@@ -462 +462 @@
             filename = filename.replace('\\', '_')
             filename = filename.replace('/', '_') 
+            filename = filename + '.att_email2trac'
     
-
             part_file = os.path.join(self.parameters.tmpdir, filename)
             s = 'writing part%d (%s)' % (n,part_file)
@@ -488 +488 @@
                 pass
 
-    def save_email_for_debug(self, message, create_tempfile=False):
+    def save_email_for_debug(self, message, project_name, create_tempfile=False):
+
+        if self.parameters.dry_run:
+            print 'DRY_RUN: NOT saving email message'
+            return
 
         if create_tempfile:
-            (fd, msg_file) = tempfile.mkstemp('.email2trac')
+            (fd, msg_file) = tempfile.mkstemp('.%s.email2trac' %project_name)
             fx = os.fdopen(fd, 'wb')
         else:
             #msg_file = '/var/tmp/msg.txt' 
-            msg_file = os.path.join(self.parameters.tmpdir, 'msg.txt')
+            msg_file = os.path.join(self.parameters.tmpdir, 'msg.%s.email2trac' %project_name)
             fx = open(msg_file, 'wb')
 
-        if self.parameters.dry_run:
-            print 'DRY_RUN: NOT saving email message to %s' %(msg_file)
-        else:
-            print 'saving email to %s' %(msg_file)
-
-            fx.write('%s' % message)
-            fx.close()
-            
-            try:
-                os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO)
-            except OSError:
-                pass
+
+        print 'saving email to %s' %(msg_file)
+        fx.write('%s' % message)
+        fx.close() 
+        
+        try:
+            os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO)
+        except OSError:
+            pass
 
         message_parts = self.get_message_parts(message)
@@ -1547 +1548 @@
 
         if self.parameters.debug:     # save the entire e-mail message text
-            self.save_email_for_debug(m, True)
+            self.save_email_for_debug(m, self.parameters.project_name, True)
 
         self.db = self.env.get_db_cnx()
@@ -2256 +2257 @@
         else:
             project['project'] = os.path.join(parentdir, name)
+
+    ##
+    # Save the project name
+    #
+    project['project_name'] = os.path.basename(project['project'])
 
     return project
@@ -2490 +2496 @@
 
         if m:
-            tktparser.save_email_for_debug(m, True)
+            tktparser.save_email_for_debug(m, settings.project_name, True)
 
         sys.exit(1)