diff --git a/extra.py b/extra.py index 3b17bb4074ef982aae1c137f4c8f8bb6e25a3869..d67cd6ce8483d67977f4d7270bee03c5379213c6 100644 --- a/extra.py +++ b/extra.py @@ -17,7 +17,7 @@ import subprocess -from bilibili_api.utils.network_httpx import request +from bilibili_api.utils.network import Api from bilibili_api.exceptions import ArgsException from bs4 import BeautifulSoup @@ -92,16 +92,19 @@ def article_to_any(article_text, dest_fmt): async def video_get_src_for_qn(vi, idx, quality = 16): '''Get a specific available source for video.''' cid = await vi.get_cid(idx) - return await request('GET', 'https://api.bilibili.com/x/player/playurl', - params={ 'avid': vi.get_aid(), 'cid': cid, 'qn': quality }, - credential=vi.credential) + api = Api('https://api.bilibili.com/x/player/playurl', 'GET', + verify=True, credential=vi.credential) + api.params={ 'avid': vi.get_aid(), 'cid': cid, 'qn': quality } + print(api) + return await api.request() async def video_get_dash_for_qn(vi, idx): '''Get a specific available source for video.''' cid = await vi.get_cid(idx) - return await request('GET', 'https://api.bilibili.com/x/player/playurl', - params={ 'avid': vi.get_aid(), 'cid': cid, 'fnval': '16' }, - credential=vi.credential) + api = Api('https://api.bilibili.com/x/player/playurl', 'GET', + verify=True, json_body=True, credential=vi.credential) + api.params = { 'avid': vi.get_aid(), 'cid': cid, 'fnval': '16' } + return await api.request() # The following algorithm is adopted from bilibili-API-collect. # https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/other/bvid_desc.md diff --git a/requirements.txt b/requirements.txt index e919b72724a3954e5e8ba5d0513d2608afbdf824..f47b3dd361cb08693172e1c85418a71c9c7b5d10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ aioflask==0.4.0 flask==2.1.3 Flask_Caching==2.0.2 -bilibili_api_python==15.4.4 +bilibili-api-python==16.1.0 redis==4.5.1 toml==0.10.2 Twisted==22.10.0