Skip to content

feat: Allow downloading without being logged in #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
skbeh wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: Allow downloading without being logged in #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions biliarchiver/archive_bvid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
9 changes: 4 additions & 5 deletions biliarchiver/cli_tools/bili_archive_bvids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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")}')


Expand All @@ -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


Expand Down