diff --git a/bin/async_capture.py b/bin/async_capture.py index 2c099d4..94e9d3d 100755 --- a/bin/async_capture.py +++ b/bin/async_capture.py @@ -131,22 +131,16 @@ class AsyncCapture(AbstractManager): self.logger.info(f'Capturing {url}') try: - capture = Capture() - if proxy: - await capture.prepare_capture(proxy=proxy) - else: - await capture.prepare_capture() - capture.prepare_cookies(cookies) - capture.user_agent = ua - if headers: - capture.http_headers = headers - await capture.prepare_context() - entries = await capture.capture_page(url, referer=referer) + async with Capture(proxy=proxy) as capture: + capture.prepare_cookies(cookies) + capture.user_agent = ua + if headers: + capture.http_headers = headers + await capture.prepare_context() + entries = await capture.capture_page(url, referer=referer) except Exception as e: self.logger.exception(f'Something went terribly wrong when capturing {url} - {e}') return False, f'Something went terribly wrong when capturing {url}.' - finally: - await capture.cleanup() if not entries: # broken diff --git a/poetry.lock b/poetry.lock index b605513..7c60842 100644 --- a/poetry.lock +++ b/poetry.lock @@ -662,7 +662,7 @@ websockets = "10.1" [[package]] name = "playwrightcapture" -version = "0.1.5" +version = "0.1.7" description = "A simple library to capture websites using playwright" category = "main" optional = false @@ -1241,7 +1241,7 @@ misp = ["python-magic", "pydeep"] [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.11" -content-hash = "75f32d9d7699fbdfb5582221ef9158b185f593ad78f815118911ec22aa066b9e" +content-hash = "cd4f04ddb7118a7aca10b15364f28d6d271fdbad37482236232e1ea2050dfd61" [metadata.files] aiohttp = [ @@ -1965,8 +1965,8 @@ playwright = [ {file = "playwright-1.21.0-py3-none-win_amd64.whl", hash = "sha256:0cdd82d4d2ce176b596e960825a4be7b03b7637e9cb243e634e896d787160535"}, ] playwrightcapture = [ - {file = "PlaywrightCapture-0.1.5-py3-none-any.whl", hash = "sha256:15bb8dcbbdd95f4772f5511b10888fe167a9e6a73d573aeebc7c5da70eb1d89e"}, - {file = "PlaywrightCapture-0.1.5.tar.gz", hash = "sha256:50bdb9792f5999a3688dbe22e6d9f50534b3d36afc4b3329811515e901ab1efe"}, + {file = "PlaywrightCapture-0.1.7-py3-none-any.whl", hash = "sha256:b32b66a1b8d47590e4ff9b88d23f6359b0b19c40149678065cf77b3ccd5a242c"}, + {file = "PlaywrightCapture-0.1.7.tar.gz", hash = "sha256:b69b51321a9bd55ebbf3b029d6ba1eb98c57826cd6158112c7cdd8fd06d7850b"}, ] prompt-toolkit = [ {file = "prompt_toolkit-3.0.29-py3-none-any.whl", hash = "sha256:62291dad495e665fca0bda814e342c69952086afb0f4094d0893d357e5c78752"}, diff --git a/pyproject.toml b/pyproject.toml index 9f2a3fa..f71cfba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,7 @@ lief = "^0.12.1" ua-parser = "^0.10.0" Flask-Login = "^0.6.0" har2tree = "^1.11.1" -playwrightcapture = "^0.1.5" +playwrightcapture = "^0.1.7" [tool.poetry.extras] misp = ['python-magic', 'pydeep']