Merge pull request #46 from Zwelf/pr-add-new-setting-better-escaping

DDNet wiki add new settings and better escaping

Author: def-

client_wiki/commands.py

@@ -2,7 +2,6 @@
 
 import sys
 import re
-import html
 
 offset = int(sys.argv[2])
 
@@ -11,6 +10,9 @@
 print(f"! <translate><!--T:{offset+2}--> Arguments</translate>")
 print(f"! <translate><!--T:{offset+3}--> Description</translate>")
 
+def escape(inp):
+    return inp.replace("|", "<nowiki>|</nowiki>")
+
 commands = {
     "save_dry": 0,
     "mute": 1,
@@ -269,15 +271,15 @@
         idx = offset + 100 + commands["ban2"]*5
       had_ban = True
   print("|-")
-  print("|", html.escape(y[1]))
+  print("|", escape(y[1]))
   if y[3].strip() == "":
     print("|")
   else:
-    print(f"| <translate><!--T:{idx}--> {html.escape(y[3])}</translate>")
+    print(f"| <translate><!--T:{idx}--> {escape(y[3])}</translate>")
   if y[-2].strip() == "":
     print("|")
   else:
-    print(f"| <translate><!--T:{idx+1}--> {html.escape(y[-2])}</translate>")
+    print(f"| <translate><!--T:{idx+1}--> {escape(y[-2])}</translate>")
 
 print('|}')
 

client_wiki/settings.py

@@ -2,7 +2,9 @@
 
 import sys
 import re
-import html
+
+def escape(inp):
+    return inp
 
 offset = int(sys.argv[2])
 
@@ -530,13 +532,15 @@
     "ui_toolbox_page": 513,
     "ui_unread_news": 514,
     # add new settings below here with increasing numbers
+    "sv_emoticon_ms_delay": 515,
+    "sv_global_emoticon_ms_delay": 516,
 }
 
 names = {}
 results = []
 
 def getValue(x):
-    return html.escape(x.lstrip()).replace("SERVERINFO_LEVEL_MIN", "0").replace("SERVERINFO_LEVEL_MAX", "2").replace("MAX_CLIENTS", "64")
+    return escape(x.lstrip()).replace("SERVERINFO_LEVEL_MIN", "0").replace("SERVERINFO_LEVEL_MAX", "2").replace("MAX_CLIENTS", "64")
 
 for line in sys.stdin:
   if sys.argv[1] not in line:
@@ -548,11 +552,11 @@ def getValue(x):
   idx = offset + 100 + settings[name] * 5
 
   if "MACRO_CONFIG_STR" in line:
-    result = (html.escape(name), idx, html.escape(y[-2]), getValue(x[3].lstrip()), "", "")
+    result = (escape(name), idx, escape(y[-2]), getValue(x[3].lstrip()), "", "")
   elif "MACRO_CONFIG_INT" in line:
-    result = (html.escape(name), idx, html.escape(y[-2]), getValue(x[2].lstrip()), getValue(x[3]), getValue(x[4]))
+    result = (escape(name), idx, escape(y[-2]), getValue(x[2].lstrip()), getValue(x[3]), getValue(x[4]))
   elif "MACRO_CONFIG_COL" in line:
-    result = (html.escape(name), idx, html.escape(y[-2]), getValue(x[2].lstrip()), "", "")
+    result = (escape(name), idx, escape(y[-2]), getValue(x[2].lstrip()), "", "")
 
   line = "|-\n"
   if y[-2].strip() == "":

client_wiki/tunings.py

@@ -2,7 +2,9 @@
 
 import sys
 import re
-import html
+
+def escape(inp):
+    return inp
 
 tunings = {
     "ground_control_speed": 0,
@@ -71,7 +73,7 @@ def foo(x):
   x = re.findall(r'(?:[^,"]|"(?:\\.|[^"])*")+', line)
 
   idx = offset + 100 + tunings[x[1].strip()] * 5
-  result = (html.escape(x[1].strip()), idx, html.escape(x[3].strip(" )\n").split('"')[-2]), html.escape(str(foo(x[2]))))
+  result = (escape(x[1].strip()), idx, escape(x[3].strip(" )\n").split('"')[-2]), escape(str(foo(x[2]))))
 
   print("|-")
   print("| %s\n| <translate><!--T:%s--> %s</translate>\n| %s" % result)