Skip to content

Bulk asynchronous downloader for multiple file hosts

fix: close flaresolverr session before aiohttp session (#1786)

NTFSvolume41a58d43f413
diff --git a/cyberdrop_dl/clients/client.py b/cyberdrop_dl/clients/client.py
index e4863cbc1..cb60ccd71 100644
--- a/cyberdrop_dl/clients/client.py
+++ b/cyberdrop_dl/clients/client.py
@@ -138,20 +138,14 @@ class HTTPClient:
async def __aexit__(self, *_) -> None:
async with asyncio.TaskGroup() as tg:
- tg.create_task(self._session.close())
tg.create_task(self._download_session.close())
- if self._flaresolverr is not None:
- tg.create_task(self._flaresolverr.aclose())
-
- if (curl := self._curl_session) is not None:
+ if self._curl_session is not None:
+ tg.create_task(self._curl_session.close())
- async def close_curl() -> None:
- try:
- await curl.close()
- except Exception:
- pass
-
- tg.create_task(close_curl())
+ if self._flaresolverr is not None:
+ # close before closing aiohttp session
+ await self._flaresolverr.aclose()
+ await self._session.close()
def _create_curl_session(self) -> AsyncSession[CurlResponse]: