Add support for characters and subfolders in sex actions

Author: bicobus

qmm/gamestruct/liliththrone.py

@@ -275,7 +275,7 @@ def secondary():
 
 
 _sexr = _MatchReValidator(
-    re.compile(r"^[^/]+/sex/(?:(?:managers|actions)/(?:[^/]+\.xml)?$|$)")
+    re.compile(r"^[^/]+/sex/(?:(?:managers|actions)/(?:[^/]+/){0,5}(?:[^/]+\.xml)?$|$)")
 )
 
 
@@ -344,3 +344,22 @@ def primary():
     @staticmethod
     def secondary():
         return None
+
+
+_chararctersr = _MatchReValidator(
+    re.compile(r"^[^/]+/characters/(?:[^/]+/){0,5}(?:[^/]+\.xml$|$)")
+)
+
+
+@as_validator
+@attr.s(frozen=True)
+class CharactersValidator:
+    data = attr.ib(validator=_chararctersr.match)
+
+    @staticmethod
+    def primary():
+        return "characters"
+
+    @staticmethod
+    def secundary():
+        return None

tests/fixtures.py

@@ -161,6 +161,10 @@ def encounters(request):
     "namespace/sex/actions/",
     "namespace/sex/managers/some_file.xml",
     "namespace/sex/actions/some_file.xml",
+    "namespace/sex/managers/somefolder/",
+    "namespace/sex/managers/somefolder/file.xml",
+    "namespace/sex/managers/some/folder/"
+    "namespace/sex/managers/some/folder/file.xml",
 ])
 def sex(request):
     return request.param
@@ -202,3 +206,14 @@ def maps_nonvalid(request):
 )
 def txt(request):
     return request.param
+
+@pytest.fixture(
+    params=[
+        "namespace/characters/",
+        "namespace/characters/file.xml",
+        "namespace/characters/folder/",
+        "namespace/characters/folder/file.xml",
+    ]
+)
+def characters(request):
+    return request.param