p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Improve readability of FlasDIWrapper

This commit is contained in:
vakarisz 2022-05-23 16:22:09 +03:00
parent 0d0f4f63f3
commit dd2aadb4c1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monkey/monkey_island/cc/app.py
View File

@ -111,7 +111,7 @@ def init_app_url_rules(app):
class FlaskDIWrapper: class FlaskDIWrapper:
class URLAlreadyExistsError(Exception): class DuplicateURLError(Exception):
pass pass
url_parameter_regex = re.compile(r"<.*?:.*?>") url_parameter_regex = re.compile(r"<.*?:.*?>")
@ -119,22 +119,20 @@ class FlaskDIWrapper:
def __init__(self, api: flask_restful.Api, container: DIContainer): def __init__(self, api: flask_restful.Api, container: DIContainer):
self._api = api self._api = api
self._container = container self._container = container
self._registered_urls = set() self._reserved_urls = set()
def add_resource(self, resource: Type[IResource]): def add_resource(self, resource: Type[IResource]):
self._register_unique_urls(resource.urls) self._reserve_urls(resource.urls)
dependencies = self._container.resolve_dependencies(resource) dependencies = self._container.resolve_dependencies(resource)
self._api.add_resource(resource, *resource.urls, resource_class_args=dependencies) self._api.add_resource(resource, *resource.urls, resource_class_args=dependencies)
def _register_unique_urls(self, urls: Iterable[str]): def _reserve_urls(self, urls: Iterable[str]):
for url in map(FlaskDIWrapper._format_url, urls): for url in map(FlaskDIWrapper._format_url, urls):
if url in self._registered_urls: if url in self._reserved_urls:
raise FlaskDIWrapper.URLAlreadyExistsError( raise FlaskDIWrapper.DuplicateURLError(f"URL {url} has already been registered!")
f"URL {url} has already been registered!"
)
self._registered_urls.add(url) self._reserved_urls.add(url)
@staticmethod @staticmethod
def _format_url(url: str): def _format_url(url: str):