Merge pull request #378 from bill88t/master

nhentai/downloader.py

@@ -75,7 +75,7 @@ class Downloader(Singleton):
                 logger.warning(f'Skipped download: {save_file_path} already exists')
                 return 1, url
 
-            response = await async_request('GET', url, timeout=self.timeout, proxies=proxy)
+            response = await async_request('GET', url, timeout=self.timeout, proxy=proxy)
 
             if response.status_code != 200:
                 path = urlparse(url).path

nhentai/utils.py

@@ -36,24 +36,20 @@ def request(method, url, **kwargs):
     return getattr(session, method)(url, verify=False, **kwargs)
 
 
-async def async_request(method, url, proxies = None, **kwargs):
+async def async_request(method, url, proxy = None, **kwargs):
     headers = {
         'Referer': constant.LOGIN_URL,
         'User-Agent': constant.CONFIG['useragent'],
         'Cookie': constant.CONFIG['cookie'],
     }
 
-    if proxies is None:
+    if proxy is None:
-        proxies = constant.CONFIG['proxy']
+        proxy = constant.CONFIG['proxy']
 
-    if proxies.get('http') == '' and proxies.get('https') == '':
+    if proxy is not None and proxy.get('http') == '' and proxy.get('https') == '':
-        proxies = None
+        proxy = None
 
-    if proxies:
+    async with httpx.AsyncClient(headers=headers, verify=False, proxy=proxy, **kwargs) as client:
-        _proxies = {f'{k}://': v for k, v in proxies.items() if v}
-        proxies = _proxies
-
-    async with httpx.AsyncClient(headers=headers, verify=False, proxies=proxies, **kwargs) as client:
         response = await client.request(method, url, **kwargs)
 
     return response

requirements.txt

@@ -1,4 +1,4 @@
-httpx==0.27.2
+httpx
 requests
 soupsieve
 setuptools