Skip to content
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

Jump to bottom

[ie/bilibili] apply geo-verification-proxy to webpage download #9817

Merged
merged 5 commits into from
May 8, 2024
Merged

[ie/bilibili] apply geo-verification-proxy to webpage download #9817

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68898ac
[ie/bilibili] apply geo-verification-proxy to webpage download
fireattack Apr 29, 2024
295ee67
Update yt_dlp/extractor/bilibili.py
fireattack Apr 29, 2024
7629901
Update yt_dlp/extractor/bilibili.py
fireattack Apr 29, 2024
717a3b8
make sure all requests are using the headers
fireattack Apr 29, 2024
3aa6516
don't return geo proxy headers in info dict
bashonly May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions yt_dlp/extractor/bilibili.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ class BiliBiliIE(BilibiliBaseIE):

def _real_extract(self, url):
video_id = self._match_id(url)
webpage, urlh = self._download_webpage_handle(url, video_id)
headers = self.geo_verification_headers()
webpage, urlh = self._download_webpage_handle(url, video_id, headers=headers)
if not self._match_valid_url(urlh.url):
fireattack marked this conversation as resolved.
Show resolved Hide resolved
return self.url_result(urlh.url)

Expand Down Expand Up @@ -666,14 +667,15 @@ class BiliBiliBangumiIE(BilibiliBaseIE):

def _real_extract(self, url):
episode_id = self._match_id(url)
webpage = self._download_webpage(url, episode_id)
headers = self.geo_verification_headers()
webpage = self._download_webpage(url, episode_id, headers=headers)

if '您所在的地区无法观看本片' in webpage:
raise GeoRestrictedError('This video is restricted')
elif '正在观看预览，大会员免费看全片' in webpage:
self.raise_login_required('This video is for premium members only')

headers = {'Referer': url, **self.geo_verification_headers()}
headers['Referer'] = url
play_info = self._download_json(
fireattack marked this conversation as resolved.
Show resolved Hide resolved
'https://api.bilibili.com/pgc/player/web/v2/playurl', episode_id,
'Extracting episode', query={'fnval': '4048', 'ep_id': episode_id},
Expand Down