From af08bd5ff6bf29b03638c2b85eae5a9359ed3f1b Mon Sep 17 00:00:00 2001 From: skbeh <60107333+skbeh@users.noreply.github.com> Date: Sun, 13 Jul 2025 18:20:37 +0000 Subject: [PATCH] feat: Allow downloading without being logged in Removes the strict requirement for a `SESSDATA` cookie, allowing the archiver to proceed even when not authenticated. - Replaces hard assertions for login status with warnings. - Informs the user that video quality is limited to 1080p when not logged in. --- biliarchiver/archive_bvid.py | 8 ++++---- biliarchiver/cli_tools/bili_archive_bvids.py | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/biliarchiver/archive_bvid.py b/biliarchiver/archive_bvid.py index 7d2fd46..724dd66 100644 --- a/biliarchiver/archive_bvid.py +++ b/biliarchiver/archive_bvid.py @@ -95,10 +95,10 @@ async def archive_bvid( ): async with semaphore: assert d.hierarchy is True, _("hierarchy 必须为 True") # 为保持后续目录结构、文件命名的一致性 - assert d.client.cookies.get("SESSDATA") is not None, _( - "sess_data 不能为空" - ) # 开个大会员呗，能下 4k 呢。 - assert logined is True, _("请先检查 SESSDATA 是否过期，再将 logined 设置为 True") # 防误操作 + if d.client.cookies.get("SESSDATA") is None: + print(_("未登录，SESSDATA 为空")) # 开个大会员呗，能下 4k 呢。 + else: + assert logined is True, _(message="请先检查 SESSDATA 是否过期，再将 logined 设置为 True") # 防误操作 upper_part = human_readable_upper_part_map(string=bvid, backward=True) videos_basepath: Path = ( config.storage_home_dir / "videos" / f"{bvid}-{upper_part}" diff --git a/biliarchiver/cli_tools/bili_archive_bvids.py b/biliarchiver/cli_tools/bili_archive_bvids.py index a4850e7..1aa644a 100644 --- a/biliarchiver/cli_tools/bili_archive_bvids.py +++ b/biliarchiver/cli_tools/bili_archive_bvids.py @@ -95,8 +95,6 @@ async def _down( update_cookies_from_file(d.client, config.cookies_file) client = Client(cookies=d.client.cookies, headers=d.client.headers) logined = is_login(client) - if not logined: - return def check_free_space(): if min_free_space_gb != 0: @@ -194,7 +192,9 @@ def update_cookies_from_file(client: AsyncClient, cookies_path: Union[str, Path] else: raise TypeError(f"cookies_path: {type(cookies_path)}") - assert os.path.exists(cookies_path), _("cookies 文件不存在: {}").format(cookies_path) + if not os.path.exists(cookies_path): + print(_("cookies 文件不存在: {}").format(cookies_path)) + return from http.cookiejar import MozillaCookieJar @@ -223,7 +223,6 @@ def update_cookies_from_file(client: AsyncClient, cookies_path: Union[str, Path] if loadded_cookies > 100: print(_("吃了过多的 cookies，可能导致 httpx.Client 怠工，响应非常缓慢")) - assert client.cookies.get("SESSDATA") is not None, "SESSDATA 不存在" # print(f'SESS_DATA: {client.cookies.get("SESSDATA")}') @@ -234,9 +233,9 @@ def is_login(cilent: Client) -> bool: if nav_json["code"] == 0: print(_("BiliBili 登录成功，饼干真香。")) print(_("NOTICE: 存档过程中请不要在 cookies 的源浏览器访问 B 站，避免 B 站刷新"), end=" ") - print(_("cookies 导致我们半路下到的视频全是 480P 的优酷土豆级醇享画质。")) return True print(_("未登录/SESSDATA无效/过期，你这饼干它保真吗？")) + print(_("未登录时下到的视频均为最高 1080P 画质。")) return False