github/XHS_Downloader
1
0
Fork 0
mirror of https://github.com/JoeanAmier/XHS-Downloader.git synced 2025-12-26 04:48:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 更新 Cookie 参数处理

Browse Source
This commit is contained in:
JoeanAmier 2024-07-29 18:40:33 +08:00
parent 01111cc401
commit dd5c09389a
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/expansion/browser.py
View File

@ -47,7 +47,7 @@ class BrowserCookie:
@classmethod
def __browser_object(cls, browser: str | int):
with suppress(ValueError):
browser = int(browser)
browser = int(browser) - 1
if isinstance(browser, int):
try:
return list(cls.SUPPORT_BROWSER.values())[browser - 1]

24
source/module/manager.py
View File

@ -42,6 +42,8 @@ class Manager:
"https://": None,
}
SEPARATE = "_"
WEB_ID = r"(?:^|; )webId=[^;]+"
WEB_SESSION = r"(?:^|; )web_session=[^;]+"
def __init__(
self,
@ -77,7 +79,9 @@ class Manager:
"Sec-Ch-Ua": sec_ch_ua or SEC_CH_UA,
"Sec-Ch-Ua-Platform": sec_ch_ua_platform or SEC_CH_UA_PLATFORM,
}
self.headers = self.blank_headers | {"Cookie": ""}
self.headers = self.blank_headers | {
"Cookie": self.clean_cookie(cookie),
}
self.retry = retry
self.chunk = chunk
self.name_format = self.__check_name_format(name_format)
@ -211,3 +215,21 @@ class Manager:
def print_proxy_tip(self, _print: bool = True, log=None, ) -> None:
if _print and self.proxy_tip:
logging(log, *self.proxy_tip)
@classmethod
def clean_cookie(cls, cookie_string: str) -> str:
for i in (
cls.WEB_ID,
cls.WEB_SESSION,
):
cookie_string = cls.delete_cookie(cookie_string, i)
return cookie_string
@classmethod
def delete_cookie(cls, cookie_string: str, pattern) -> str:
# 使用空字符串替换匹配到的部分
cookie_string = sub(pattern, "", cookie_string)
# 去除多余的分号和空格
cookie_string = sub(r';\s*$', "", cookie_string) # 删除末尾的分号和空格
cookie_string = sub(r';\s*;', ";", cookie_string) # 删除中间多余分号后的空格
return cookie_string.strip('; ')