diff --git a/StreamingCommunity/Api/Site/1337xx/site.py b/StreamingCommunity/Api/Site/1337xx/site.py index 1ae9c01..976e621 100644 --- a/StreamingCommunity/Api/Site/1337xx/site.py +++ b/StreamingCommunity/Api/Site/1337xx/site.py @@ -58,8 +58,9 @@ def title_search(word_to_search: str) -> int: response = httpx.get( url=search_url, headers={'user-agent': get_userAgent()}, - follow_redirects=True, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY, + follow_redirects=True ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Site/animeunity/site.py b/StreamingCommunity/Api/Site/animeunity/site.py index aba3392..840dd68 100644 --- a/StreamingCommunity/Api/Site/animeunity/site.py +++ b/StreamingCommunity/Api/Site/animeunity/site.py @@ -148,7 +148,8 @@ def title_search(title: str) -> int: cookies=cookies, headers=headers, json=json_data, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Site/cb01new/site.py b/StreamingCommunity/Api/Site/cb01new/site.py index 30033fa..1d5a56e 100644 --- a/StreamingCommunity/Api/Site/cb01new/site.py +++ b/StreamingCommunity/Api/Site/cb01new/site.py @@ -58,7 +58,9 @@ def title_search(word_to_search: str) -> int: response = httpx.get( url=search_url, headers={'user-agent': get_userAgent()}, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY, + follow_redirects=True ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Site/ddlstreamitaly/site.py b/StreamingCommunity/Api/Site/ddlstreamitaly/site.py index 19cc2ae..5ee5df4 100644 --- a/StreamingCommunity/Api/Site/ddlstreamitaly/site.py +++ b/StreamingCommunity/Api/Site/ddlstreamitaly/site.py @@ -60,7 +60,9 @@ def title_search(word_to_search: str) -> int: response = httpx.get( url=search_url, headers={'user-agent': get_userAgent()}, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY, + follow_redirects=True ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Site/guardaserie/site.py b/StreamingCommunity/Api/Site/guardaserie/site.py index 60ae487..f11835f 100644 --- a/StreamingCommunity/Api/Site/guardaserie/site.py +++ b/StreamingCommunity/Api/Site/guardaserie/site.py @@ -58,7 +58,9 @@ def title_search(word_to_search: str) -> int: response = httpx.get( url=search_url, headers={'user-agent': get_userAgent()}, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY, + follow_redirects=True ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Site/streamingcommunity/site.py b/StreamingCommunity/Api/Site/streamingcommunity/site.py index f229850..b181d87 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/site.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/site.py @@ -55,14 +55,16 @@ def title_search(title_search: str) -> int: media_search_manager.clear() table_show_manager.clear() - search_url = f"{site_constant.FULL_URL}/api/search?q={title_search}", + search_url = f"{site_constant.FULL_URL}/api/search?q={title_search}" console.print(f"[cyan]Search url: [yellow]{search_url}") try: response = httpx.get( url=search_url, headers={'user-agent': get_userAgent()}, - timeout=max_timeout + timeout=max_timeout, + verify=site_constant.VERIFY, + follow_redirects=True ) response.raise_for_status() diff --git a/StreamingCommunity/Api/Template/Util/get_domain.py b/StreamingCommunity/Api/Template/Util/get_domain.py index 76ebe76..179e14c 100644 --- a/StreamingCommunity/Api/Template/Util/get_domain.py +++ b/StreamingCommunity/Api/Template/Util/get_domain.py @@ -15,6 +15,9 @@ from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager +# Variable +VERIFY = config_manager.get("REQUESTS", "verify") + def get_tld(url_str): """Extract the TLD (Top-Level Domain) from the URL.""" @@ -79,7 +82,7 @@ def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1): return False, None client = httpx.Client( - verify=False, + verify=VERIFY, headers=get_headers(), timeout=max_timeout ) diff --git a/StreamingCommunity/Api/Template/config_loader.py b/StreamingCommunity/Api/Template/config_loader.py index e0a4ab5..7c159b1 100644 --- a/StreamingCommunity/Api/Template/config_loader.py +++ b/StreamingCommunity/Api/Template/config_loader.py @@ -31,6 +31,10 @@ class SiteConstant: def ROOT_PATH(self): return config_manager.get('DEFAULT', 'root_path') + @property + def VERIFY(self): + return config_manager.get('REQUESTS', 'verify') + @property def DOMAIN_NOW(self): return config_manager.get_site(self.SITE_NAME, 'domain') diff --git a/config.json b/config.json index 76cd172..0c369ab 100644 --- a/config.json +++ b/config.json @@ -24,6 +24,7 @@ "telegram_bot": false }, "REQUESTS": { + "verify": false, "timeout": 20, "max_retry": 8, "proxy_start_min": 0.1, diff --git a/requirements.txt b/requirements.txt index a52c05a..71d9688 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ bs4 rich tqdm m3u8 +certifi psutil unidecode jsbeautifier @@ -11,5 +12,4 @@ pycryptodomex ua-generator qbittorrent-api python-qbittorrent -Pillow pyTelegramBotAPI \ No newline at end of file