Skip to content

Bulk asynchronous downloader for multiple file hosts

fix: flaresolverr retry (#1806)

NTFSvolume2c7ebcb36213
diff --git a/cyberdrop_dl/clients/http.py b/cyberdrop_dl/clients/http.py
index 7ef3c441d..fc92562a0 100644
--- a/cyberdrop_dl/clients/http.py
+++ b/cyberdrop_dl/clients/http.py
@@ -217,17 +217,16 @@ class HTTPClient:
) -> AsyncGenerator[AbstractResponse[Any]]:
"""Make an HTTP request and retry w flaresolverr if required"""
self = cast("HTTPClient", self)
- yielded: bool = False
- try:
- async with self.raw_request(url, method, headers, impersonate, data, json, request_params) as resp:
+ async with self.raw_request(url, method, headers, impersonate, data, json, request_params) as resp:
+ try:
await self.check_http_status(resp)
- yielded = True
+ except DDOSGuardError:
+ await resp.aclose()
+ if not self.flaresolverr:
+ raise
+ yield await self._flaresolverr_request(url, data)
+ else:
yield resp
- except DDOSGuardError:
- if yielded or not self.flaresolverr:
- raise
-
- yield await self._flaresolverr_request(url, data)
@contextlib.asynccontextmanager
async def raw_request(