Cleanup replace_special_variables

Author: Fernando-A-Rocha

web/scripts/builder.py

@@ -5,7 +5,6 @@
 import http
 import subprocess
 import signal
-import re
 from datetime import date
 from pathlib import Path
 
@@ -387,19 +386,6 @@ def create_element_page(self, element):
             html_file.write(html_content)
 
         self.logger.info(f"Generated {output_path} for element {element['name']}")
-
-    def process_special_article_content(self, content):
-        specials = re.findall(r'\{\{.*?\}\}', content)
-        specials = [s[2:-2] for s in specials]
-        for special in specials:
-            if special == 'elements_list':
-                html_list = "<ul>"
-                for element in self.elements:
-                    html_list += f"<li><a href='{element['path_html']}'>{element['name'].capitalize()}</a></li>"
-                html_list += "</ul>"
-                content = content.replace(f"{{{{elements_list}}}}", html_list)
-
-        return content
 
     def create_function_page(self, function):
         function_template = self.input_env.get_template('function.html')
@@ -417,7 +403,7 @@ def create_function_page(self, function):
 
     def create_article_page(self, article):
         article_template = self.input_env.get_template('article.html')
-        article["content_html"] = self.process_special_article_content(article["content_html"])
+        article["content_html"] = utils.replace_special_variables(self, article["content_html"])
         html_content = self.render_page(article['title'], article_template.render(article=article))
 
         article_folder = OUTPUT_HTML_PATH + article["path_html"]

web/scripts/utils.py

@@ -24,3 +24,21 @@ def to_html(markdown_text, single_paragraph=False):
     if single_paragraph:
         html = re.sub(r'<p>(.*?)</p>', r'\1', html)
     return html
+
+def replace_special_variables(wiki_builder, text):
+    specials = re.findall(r'\{\{.*?\}\}', text)
+    specials = [s[2:-2] for s in specials]
+    for special in specials:
+        r_text = None
+
+        # List of Element types
+        if special == 'elements_list':
+            r_text = "<ul>"
+            for element in wiki_builder.elements:
+                r_text += f"<li><a href='{element['path_html']}'>{element['name'].capitalize()}</a></li>"
+            r_text += "</ul>"
+
+        if r_text:
+            text = text.replace("{{" + special + "}}", r_text)
+
+    return text