nikto_b/turbosloth
1
1
Fork 0
Code Issues 7 Pull Requests Actions Packages Releases Wiki Activity

Make router matcher lazy

Browse Source
This commit is contained in:
Артур Шевченко
2025-07-19 04:12:46 +03:00
parent 15f6438407
commit af46710017
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/turbosloth/router.py
View File

@@ -42,8 +42,8 @@ class Route:
if '}' not in part: if '}' not in part:
raise ValueError(f'Invalid subpath substitute placeholder: {part}') raise ValueError(f'Invalid subpath substitute placeholder: {part}')
re_part = part.replace('(', '\\(').replace(')', '\\)') re_part = part.replace('(', '\\(').replace(')', '\\)')
names = re.findall(r'\{(.*)}', part) names = re.findall(r'\{(.*?)}', part)
re_part = re.sub(r'\{.*}', r'(.*)', re_part) re_part = re.sub(r'\{.*?}', r'(.*?)', re_part)
re_part = re.compile('^' + re_part + '$') re_part = re.compile('^' + re_part + '$')
d = self._find_regexp_subroute(re_part) d = self._find_regexp_subroute(re_part)
@@ -100,10 +100,12 @@ class Router:
def add(self, method: MethodType, path_pattern: str, handler: InternalHandlerType) -> None: def add(self, method: MethodType, path_pattern: str, handler: InternalHandlerType) -> None:
method = typing.cast(MethodType, method.upper()) method = typing.cast(MethodType, method.upper())
substitutes = re.findall(r'\{(.*)}', path_pattern) substitutes = re.findall(r'\{(.*?)}', path_pattern)
if len(substitutes) > 0: if len(substitutes) > 0:
subst = [] subst = []
for s in substitutes: for s in substitutes:
if isinstance(s, str):
s = [s]
subst += list(s) subst += list(s)
if len(subst) != len(set(subst)): if len(subst) != len(set(subst)):
raise ValueError('Duplicate path substitute names are prohibited') raise ValueError('Duplicate path substitute names are prohibited')