mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-28 21:57:57 +00:00
[extractor/cda] Review fixes
This commit is contained in:
parent
0e6e2af798
commit
850d7300cd
|
@ -110,8 +110,7 @@ class CDAIE(InfoExtractor):
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _download_age_confirm_page(self, url, video_id, *args, **kwargs):
|
def _download_age_confirm_page(self, url, video_id, *args, **kwargs):
|
||||||
form_data = {'age_confirm': ''}
|
data, content_type = multipart_encode({'age_confirm': ''})
|
||||||
data, content_type = multipart_encode(form_data)
|
|
||||||
return self._download_webpage(
|
return self._download_webpage(
|
||||||
url, video_id, *args,
|
url, video_id, *args,
|
||||||
data=data, headers={
|
data=data, headers={
|
||||||
|
@ -183,7 +182,7 @@ def _real_extract(self, url):
|
||||||
if 'Authorization' in self._API_HEADERS:
|
if 'Authorization' in self._API_HEADERS:
|
||||||
return self._api_extract(video_id)
|
return self._api_extract(video_id)
|
||||||
else:
|
else:
|
||||||
return self._web_extract(video_id, url)
|
return self._web_extract(video_id)
|
||||||
|
|
||||||
def _api_extract(self, video_id):
|
def _api_extract(self, video_id):
|
||||||
meta = self._download_json(
|
meta = self._download_json(
|
||||||
|
@ -216,17 +215,15 @@ def _api_extract(self, video_id):
|
||||||
'view_count': meta.get('views'),
|
'view_count': meta.get('views'),
|
||||||
}
|
}
|
||||||
|
|
||||||
def _web_extract(self, video_id, url):
|
def _web_extract(self, video_id):
|
||||||
self._set_cookie('cda.pl', 'cda.player', 'html5')
|
self._set_cookie('cda.pl', 'cda.player', 'html5')
|
||||||
url = f'{self._BASE_URL}/video/{video_id}'
|
webpage, urlh = self._download_webpage_handle(
|
||||||
webpage = self._download_webpage(url, video_id)
|
f'{self._BASE_URL}/video/{video_id}/vfilm', video_id)
|
||||||
|
url = urlh.url
|
||||||
|
|
||||||
if 'Ten film jest dostępny dla użytkowników premium' in webpage:
|
if 'Ten film jest dostępny dla użytkowników premium' in webpage:
|
||||||
self.raise_login_required('This video is only available for premium users')
|
self.raise_login_required('This video is only available for premium users')
|
||||||
|
|
||||||
if re.search(f'video/{video_id}/vfilm', webpage):
|
|
||||||
url += '/vfilm'
|
|
||||||
|
|
||||||
if re.search(r'niedostępn[ey] w(?: |\s+)Twoim kraju\s*<', webpage):
|
if re.search(r'niedostępn[ey] w(?: |\s+)Twoim kraju\s*<', webpage):
|
||||||
self.raise_geo_restricted()
|
self.raise_geo_restricted()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue