test: cleanup

app/services/mo.py

@@ -7,13 +7,9 @@ from injectable import injectable, autowired, Autowired
 from app.services import Passwords
 
 
-class ComplexValueTemplate(Template):
-  # Pozwala na kropki w nazwach placeholderów, np. ${user.name.first}
-  idpattern = r'[_a-zA-Z][_a-zA-Z0-9.]*'
-
-
-class SimpleValueTemplate(ComplexValueTemplate):
-  delimiter = '%'
+class ValueTemplate(Template):
+  # Pozwala na kropki i ukośniki w nazwach placeholderów, np. ${user.name/first}
+  idpattern = r'[_a-zA-Z][_a-zA-Z0-9.\/]*'
 
 
 @injectable
@@ -26,12 +22,9 @@ class Mo:
     raw = ''
     with open(mo_file, "r") as mo:
       raw = mo.read()
-    cmp = ComplexValueTemplate(raw)
-    rendered = cmp.substitute(self._passwords.get_values(cmp.get_identifiers()))
-    smp = SimpleValueTemplate(rendered)
-    ids = [_id + '.password' for _id in smp.get_identifiers()]
-    mappings = {k.replace('.password', ''): v for k, v in self._passwords.get_values(ids).items()}
-    rendered = smp.substitute(mappings)
+    parsed = ValueTemplate(raw)
+    mappings = self._passwords.get_values(parsed.get_identifiers())
+    rendered = parsed.safe_substitute(mappings)
     de_mo_ified = str(mo_file).replace(".mo", "")
     with open(de_mo_ified, "w") as mo:
       mo.write(rendered)