Changeset 666


Ignore:
Timestamp:
04/28/15 10:40:03 (9 years ago)
Author:
bas
Message:

added a new option: save_raw_message

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r664 r666  
     12.8.9:
     2   * Added a new parameter only save email and removed some obsolete code in ave_email_for_debug,
     3     - save_raw_message
     4    Author: Bas van der Vlies
     5
    162.8.8:
    27    * No properly applied the patch for ticket #364.
  • trunk/email2trac.py.in

    r664 r666  
    562562                pass
    563563
    564     def save_email_for_debug(self, message, project_name, create_tempfile=False):
     564    def save_email_for_debug(self, message, project_name, save_only_raw_message=False):
    565565
    566566        if self.parameters.dry_run:
     
    568568            return
    569569
    570         if create_tempfile:
    571             (fd, tmp_file) = tempfile.mkstemp('.%s.email2trac' %project_name)
    572             fx = os.fdopen(fd, 'wb')
    573         else:
    574             tmp_file = os.path.join(self.parameters.tmpdir, 'msg.%s.email2trac' %project_name)
    575             fx = open(tmp_file, 'wb')
    576 
     570        (fd, tmp_file) = tempfile.mkstemp('.email2trac', project_name, self.parameters.tmpdir)
     571        fx = os.fdopen(fd, 'wb')
    577572
    578573        self.logger.debug('saving email to %s' %(tmp_file))
     
    585580            pass
    586581
    587         message_parts = self.get_message_parts(message)
    588         message_parts = self.unique_attachment_names(message_parts)
    589         body_text = self.get_body_text(message_parts)
    590         self.debug_body(body_text, tmp_file)
    591         self.debug_attachments(message_parts, tmp_file)
     582        if not save_only_raw_message:
     583            message_parts = self.get_message_parts(message)
     584            message_parts = self.unique_attachment_names(message_parts)
     585            body_text = self.get_body_text(message_parts)
     586            self.debug_body(body_text, tmp_file)
     587            self.debug_attachments(message_parts, tmp_file)
    592588
    593589########## Conversion functions  ###########################################################
     
    17721768            pass
    17731769
    1774         if self.parameters.debug:     # save the entire e-mail message text
     1770        if self.parameters.debug: # save email + try to decode message part
     1771            self.save_email_for_debug(m, self.parameters.project_name)
     1772        elif self.parameters.save_raw_message:     # save only the raw e-mail message text
    17751773            self.save_email_for_debug(m, self.parameters.project_name, True)
    17761774
     
    29242922
    29252923        if m:
    2926             tktparser.save_email_for_debug(m, settings.project_name, True)
     2924            tktparser.save_email_for_debug(m, settings.project_name)
    29272925
    29282926        sys.exit(1)
Note: See TracChangeset for help on using the changeset viewer.