Fix images and links parsing in doku_to_markdown

Signed-off-by: Skia <skia@libskia.so>

core/utils.py

@@ -94,8 +94,10 @@ def doku_to_markdown(text):
 
     text = re.sub(r'\\{2,}[\s]', r'   \n', text) # Carriage return
 
-    text = re.sub(r'\[\[(.*?)(\|(.*?))?\]\]', r'[\3](\1)', text) # Links
-    text = re.sub(r'{{(.*?)(\|(.*?))?}}', r'![\3](\1 "\3")', text) # Images
+    text = re.sub(r'\[\[(.*?)\|(.*?)\]\]', r'[\2](\1)', text) # Links
+    text = re.sub(r'\[\[(.*?)\]\]', r'[\1](\1)', text) # Links 2
+    text = re.sub(r'{{(.*?)\|(.*?)}}', r'![\2](\1 "\2")', text) # Images
+    text = re.sub(r'{{(.*?)(\|(.*?))?}}', r'![\1](\1 "\1")', text) # Images 2
     text = re.sub(r'{\[(.*?)(\|(.*?))?\]}', r'[\1](\1)', text) # Video (transform to classic links, since we can't integrate them)
 
     text = re.sub(r'###(\d*?)###', r'[[[\1]]]', text) # Progress bar

migrate.py

@@ -1276,10 +1276,13 @@ def migrate_forum():
                     title=to_unicode(r['titre_message'])[:63],
                     date=r['date_message'].replace(tzinfo=timezone('Europe/Paris')),
                     )
-                if r['syntaxengine_message'] == "doku":
-                    msg.message = doku_to_markdown(to_unicode(r['contenu_message']))
-                else:
-                    msg.message = bbcode_to_markdown(to_unicode(r['contenu_message']))
+                try:
+                    if r['syntaxengine_message'] == "doku":
+                        msg.message = doku_to_markdown(to_unicode(r['contenu_message']))
+                    else:
+                        msg.message = bbcode_to_markdown(to_unicode(r['contenu_message']))
+                except:
+                    msg.message = to_unicode(r['contenu_message'])
                 msg.save()
             except Exception as e:
                 print("  FAIL to migrate message: %s" % (repr(e)))