From 36aa321adea9f4477ee4bc167433ff4464b6dc73 Mon Sep 17 00:00:00 2001 From: Hellagur4225 Date: Mon, 24 Mar 2025 10:13:42 +0800 Subject: [PATCH] Fix none attributes in session headers --- nhentai/utils.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/nhentai/utils.py b/nhentai/utils.py index a6fa899..a627537 100644 --- a/nhentai/utils.py +++ b/nhentai/utils.py @@ -20,14 +20,24 @@ from nhentai.serializer import serialize_comic_xml, serialize_json, serialize_in MAX_FIELD_LENGTH = 100 EXTENSIONS = ('.png', '.jpg', '.jpeg', '.gif', '.webp') +def get_headers(): + headers = { + 'Referer': constant.LOGIN_URL + } + + user_agent = constant.CONFIG.get('useragent') + if user_agent and user_agent.strip(): + headers['User-Agent'] = user_agent + + cookie = constant.CONFIG.get('cookie') + if cookie and cookie.strip(): + headers['Cookie'] = cookie + + return headers def request(method, url, **kwargs): session = requests.Session() - session.headers.update({ - 'Referer': constant.LOGIN_URL, - 'User-Agent': constant.CONFIG['useragent'], - 'Cookie': constant.CONFIG['cookie'] - }) + session.headers.update(get_headers()) if not kwargs.get('proxies', None): kwargs['proxies'] = { @@ -39,11 +49,7 @@ def request(method, url, **kwargs): async def async_request(method, url, proxy = None, **kwargs): - headers = { - 'Referer': constant.LOGIN_URL, - 'User-Agent': constant.CONFIG['useragent'], - 'Cookie': constant.CONFIG['cookie'], - } + headers=get_headers() if proxy is None: proxy = constant.CONFIG['proxy']