Add option to disable parsing for txt mail

tracim/development.ini.base

@@ -227,6 +227,7 @@ email.reply.token = mysecuretoken
 # Delay in seconds between each check
 email.reply.check.heartbeat = 60
 email.reply.use_html_parsing = true
+email.reply.use_txt_parsing = true
 
 ## Radical (CalDav server) configuration
 # radicale.server.host = 0.0.0.0

tracim/tracim/config/app_cfg.py

@@ -388,6 +388,10 @@ class CFG(object):
             'email.reply.use_html_parsing',
             True,
         ))
+        self.EMAIL_REPLY_USE_TXT_PARSING = asbool(tg.config.get(
+            'email.reply.use_txt_parsing',
+            True,
+        ))
 
         self.TRACKER_JS_PATH = tg.config.get(
             'js_tracker_path',

tracim/tracim/lib/daemons.py

@@ -178,6 +178,7 @@ class MailFetcherDaemon(Daemon):
             endpoint=cfg.WEBSITE_BASE_URL + "/events",
             token=cfg.EMAIL_REPLY_TOKEN,
             use_html_parsing=cfg.EMAIL_REPLY_USE_HTML_PARSING,
+            use_txt_parsing=cfg.EMAIL_REPLY_USE_TXT_PARSING,
         )
         self._fetcher.run()
 

tracim/tracim/lib/email_fetcher.py

@@ -58,7 +58,8 @@ class DecodedMail(object):
 
     def get_body(
             self,
-            use_html_parsing=True
+            use_html_parsing=True,
+            use_txt_parsing=True,
     ) -> typing.Optional[str]:
         body_part = self._get_mime_body_message()
         body = None
@@ -68,7 +69,10 @@ class DecodedMail(object):
             if content_type == CONTENT_TYPE_TEXT_PLAIN:
                 txt_body = body_part.get_payload(decode=True).decode(
                     charset)
-                body = DecodedMail._parse_txt_body(txt_body)
+                if use_txt_parsing:
+                    txt_body = EmailReplyParser.parse_reply(txt_body)
+                html_body = markdown.markdown(txt_body)
+                body = DecodedMail._sanitize_html_body(html_body)
 
             elif content_type == CONTENT_TYPE_TEXT_HTML:
                 html_body = body_part.get_payload(decode=True).decode(
@@ -80,14 +84,6 @@ class DecodedMail(object):
         return body
 
     @classmethod
-    def _parse_txt_body(cls, txt_body: str) -> str:
-        # TODO - G.M - 2017-11-30 - Add option to disable parsing
-        txt_body = EmailReplyParser.parse_reply(txt_body)
-        html_body = markdown.markdown(txt_body)
-        body = DecodedMail._sanitize_html_body(html_body)
-        return body
-
-    @classmethod
     def _sanitize_html_body(cls, html_body: str) -> str:
         soup = BeautifulSoup(html_body, 'html.parser')
         config = BEAUTIFULSOUP_HTML_BODY_SANITIZE_CONFIG
@@ -187,7 +183,8 @@ class MailFetcher(object):
         delay: int,
         endpoint: str,
         token: str,
-        use_html_parsing: bool
+        use_html_parsing: bool,
+        use_txt_parsing: bool,
     ) -> None:
         """
         Fetch mail from a mailbox folder through IMAP and add their content to
@@ -215,6 +212,7 @@ class MailFetcher(object):
         self.endpoint = endpoint
         self.token = token
         self.use_html_parsing = use_html_parsing
+        self.use_txt_parsing = use_txt_parsing
 
         self._is_active = True
 
@@ -320,7 +318,8 @@ class MailFetcher(object):
                    'content_id': mail.get_key(),
                    'payload': {
                        'content': mail.get_body(
-                           use_html_parsing=self.use_html_parsing),
+                           use_html_parsing=self.use_html_parsing,
+                           use_txt_parsing=self.use_txt_parsing),
                    }}
             try:
                 r = requests.post(self.endpoint, json=msg)