mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-10-22 17:11:27 +02:00
Compare commits
2 Commits
474c81e935
...
d024a5a8f6
Author | SHA1 | Date | |
---|---|---|---|
|
d024a5a8f6 | ||
|
66f1534836 |
|
@ -992,7 +992,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
|
||||||
}
|
}
|
||||||
return filter_dict(headers)
|
return filter_dict(headers)
|
||||||
|
|
||||||
def _generate_webpage_headers(self, url):
|
def _generate_webpage_headers(self):
|
||||||
return self._generate_oauth_headers()
|
return self._generate_oauth_headers()
|
||||||
|
|
||||||
def _download_ytcfg(self, client, video_id):
|
def _download_ytcfg(self, client, video_id):
|
||||||
|
@ -1005,7 +1005,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
|
||||||
return {}
|
return {}
|
||||||
webpage = self._download_webpage(
|
webpage = self._download_webpage(
|
||||||
url, video_id, fatal=False, note=f'Downloading {client.replace("_", " ").strip()} client config',
|
url, video_id, fatal=False, note=f'Downloading {client.replace("_", " ").strip()} client config',
|
||||||
headers=self._generate_webpage_headers(url))
|
headers=self._generate_webpage_headers())
|
||||||
return self.extract_ytcfg(video_id, webpage) or {}
|
return self.extract_ytcfg(video_id, webpage) or {}
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -3266,7 +3266,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
||||||
player_url, video_id, fatal=fatal,
|
player_url, video_id, fatal=fatal,
|
||||||
note='Downloading player ' + player_id,
|
note='Downloading player ' + player_id,
|
||||||
errnote=f'Download of {player_url} failed',
|
errnote=f'Download of {player_url} failed',
|
||||||
headers=self._generate_webpage_headers(player_url))
|
headers=self._generate_webpage_headers())
|
||||||
if code:
|
if code:
|
||||||
self._code_cache[player_id] = code
|
self._code_cache[player_id] = code
|
||||||
return self._code_cache.get(player_id)
|
return self._code_cache.get(player_id)
|
||||||
|
@ -3550,7 +3550,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
||||||
self._download_webpage(
|
self._download_webpage(
|
||||||
url, video_id, f'Marking {label}watched',
|
url, video_id, f'Marking {label}watched',
|
||||||
'Unable to mark watched', fatal=False,
|
'Unable to mark watched', fatal=False,
|
||||||
headers=self._generate_webpage_headers(url))
|
headers=self._generate_webpage_headers())
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _extract_from_webpage(cls, url, webpage):
|
def _extract_from_webpage(cls, url, webpage):
|
||||||
|
@ -4542,7 +4542,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
||||||
if pp:
|
if pp:
|
||||||
query['pp'] = pp
|
query['pp'] = pp
|
||||||
webpage = self._download_webpage(
|
webpage = self._download_webpage(
|
||||||
webpage_url, video_id, fatal=False, query=query, headers=self._generate_webpage_headers(webpage_url))
|
webpage_url, video_id, fatal=False, query=query, headers=self._generate_webpage_headers())
|
||||||
|
|
||||||
master_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg()
|
master_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg()
|
||||||
|
|
||||||
|
@ -5829,7 +5829,7 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
|
||||||
webpage, data = None, None
|
webpage, data = None, None
|
||||||
for retry in self.RetryManager(fatal=fatal):
|
for retry in self.RetryManager(fatal=fatal):
|
||||||
try:
|
try:
|
||||||
webpage = self._download_webpage(url, item_id, note='Downloading webpage', headers=self._generate_webpage_headers(url))
|
webpage = self._download_webpage(url, item_id, note='Downloading webpage', headers=self._generate_webpage_headers())
|
||||||
data = self.extract_yt_initial_data(item_id, webpage or '', fatal=fatal) or {}
|
data = self.extract_yt_initial_data(item_id, webpage or '', fatal=fatal) or {}
|
||||||
except ExtractorError as e:
|
except ExtractorError as e:
|
||||||
if isinstance(e.cause, network_exceptions):
|
if isinstance(e.cause, network_exceptions):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user