From 514de022f44fef7071aaa894f70774a7f1ea6ba0 Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Mon, 10 May 2021 14:58:26 +0200
Subject: [PATCH] [FIX] runbot: fix markdown code

When code blocks were containing markdown like text, the inside of the code
block was also formated.

This commit removes the code blocks before applying other formating and
place them back at the end.

closes #481
---
 runbot/common.py           | 26 +++++++++++++++++++-------
 runbot/tests/test_event.py | 13 +++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/runbot/common.py b/runbot/common.py
index d6a485f0..27a1b5bc 100644
--- a/runbot/common.py
+++ b/runbot/common.py
@@ -122,12 +122,19 @@ def list_local_dbs(additionnal_conditions=None):
 
 def pseudo_markdown(text):
     text = utils.escape(text)
+
+    # first, extract code blocs:
+    codes = []
+    def code_remove(match):
+        codes.append(match.group(1))
+        return f'<code>{len(codes)-1}</code>'
+
     patterns = {
-            r'\*\*(.+?)\*\*': '<strong>\g<1></strong>',
-            r'~~(.+?)~~': '<del>\g<1></del>',  # it's not official markdown but who cares
-            r'__(.+?)__': '<ins>\g<1></ins>',  # same here, maybe we should change the method name
-            r'`(.+?)`': '<code>\g<1></code>',
-            r'\r?\n': '<br/>',
+        r'`(.+?)`': code_remove,
+        r'\*\*(.+?)\*\*': '<strong>\\g<1></strong>',
+        r'~~(.+?)~~': '<del>\\g<1></del>',  # it's not official markdown but who cares
+        r'__(.+?)__': '<ins>\\g<1></ins>',  # same here, maybe we should change the method name
+        r'\r?\n': '<br/>',
     }
 
     for p, b in patterns.items():
@@ -135,9 +142,14 @@ def pseudo_markdown(text):
 
     # icons
     re_icon = re.compile(r'@icon-([a-z0-9-]+)')
-    text = re_icon.sub('<i class="fa fa-\g<1>"></i>', text)
+    text = re_icon.sub('<i class="fa fa-\\g<1>"></i>', text)
 
     # links
     re_links = re.compile(r'\[(.+?)\]\((.+?)\)')
-    text = re_links.sub('<a href="\g<2>">\g<1></a>', text)
+    text = re_links.sub('<a href="\\g<2>">\\g<1></a>', text)
+
+    def code_replace(match):
+        return f'<code>{codes[int(match.group(1))]}</code>'
+
+    text = re.sub(r'<code>(\d+)</code>', code_replace, text, flags=re.DOTALL)
     return text
diff --git a/runbot/tests/test_event.py b/runbot/tests/test_event.py
index c7def2ff..1bb0ebf3 100644
--- a/runbot/tests/test_event.py
+++ b/runbot/tests/test_event.py
@@ -91,6 +91,19 @@ class TestIrLogging(RunbotCase):
             'Hello <i class="fa fa-file-text-o"></i>'
         )
 
+        log.message = 'a bit of code :\n`print(__name__)`'
+        self.assertEqual(
+            log._markdown(),
+            'a bit of code :<br/><code>print(__name__)</code>'
+        )
+
+        log.message = 'a bit of __code__ :\n`print(__name__)` **but also** `print(__name__)`'
+        self.assertEqual(
+            log._markdown(),
+            'a bit of <ins>code</ins> :<br/><code>print(__name__)</code> <strong>but also</strong> <code>print(__name__)</code>'
+        )
+
+
         # test links
         log.message = 'This [link](https://wwww.somewhere.com) goes to somewhere and [this one](http://www.nowhere.com) to nowhere.'
         self.assertEqual(