Merge branch 'main' into feat/bilibili-cookie

This commit is contained in:
2025-01-04 11:00:44 +08:00
committed by GitHub
31 changed files with 3809 additions and 5423 deletions
+5 -5
View File
@@ -79,8 +79,8 @@ class CookieClientManager(ClientManager):
new_anonymous_cookie = await self._generate_anonymous_cookie()
await config.add_cookie(new_anonymous_cookie)
async def add_user_cookie(self, content: str, cookie_name: str | None = None) -> Cookie:
"""添加用户 cookie"""
async def add_identified_cookie(self, content: str, cookie_name: str | None = None) -> Cookie:
"""添加实名 cookie"""
if not await self.validate_cookie(content):
raise ValueError()
@@ -133,9 +133,9 @@ class CookieClientManager(ClientManager):
client = http_client()
cookie = await self._choose_cookie(target)
if cookie.is_universal:
logger.trace(f"平台 {self._site_name} 未获取到用户cookie, 使用匿名cookie")
logger.trace(f"平台 {self._site_name} 未获取到实名cookie, 使用匿名cookie")
else:
logger.trace(f"平台 {self._site_name} 获取到用户cookie: {cookie.id}")
logger.trace(f"平台 {self._site_name} 获取到实名cookie: {cookie.id}")
return await self._assemble_client(client, cookie)
@@ -185,7 +185,7 @@ class SiteMeta(type):
elif not kwargs.get("abstract"):
# this is the subclass
if "name" in namespace:
site_manager[namespace["name"]] = cls
site_manager[namespace["name"]] = cls # type: ignore[reportArgumentType]
super().__init__(name, bases, namespace, **kwargs)