mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-10 01:02:13 +01:00
[youtube] Add player_client=all
This commit is contained in:
parent
ea05b3020d
commit
b4c055bac2
2 changed files with 15 additions and 8 deletions
|
@ -1354,7 +1354,7 @@ # EXTRACTOR ARGUMENTS
|
|||
The following extractors use this feature:
|
||||
* **youtube**
|
||||
* `skip`: `hls` or `dash` (or both) to skip download of the respective manifests
|
||||
* `player_client`: Clients to extract video data from - one or more of `web`, `android`, `ios`, `web_music`, `android_music`, `ios_music`. By default, `android,web` is used. If the URL is from `music.youtube.com`, `android,web,android_music,web_music` is used
|
||||
* `player_client`: Clients to extract video data from - one or more of `web`, `android`, `ios`, `web_music`, `android_music`, `ios_music` or `all`. By default, `android,web` is used. If the URL is from `music.youtube.com`, `android,web,android_music,web_music` is used
|
||||
* `player_skip`: `configs` - skip any requests for client configs and use defaults
|
||||
* `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side).
|
||||
* `max_comments`: maximum amount of comments to download (default all).
|
||||
|
|
|
@ -451,10 +451,6 @@ def _real_initialize(self):
|
|||
|
||||
# clients starting with _ cannot be explicity requested by the user
|
||||
_YT_CLIENTS = {
|
||||
'web': 'WEB',
|
||||
'web_music': 'WEB_REMIX',
|
||||
'_web_embedded': 'WEB_EMBEDDED_PLAYER',
|
||||
'_web_agegate': 'TVHTML5',
|
||||
'android': 'ANDROID',
|
||||
'android_music': 'ANDROID_MUSIC',
|
||||
'_android_embedded': 'ANDROID_EMBEDDED_PLAYER',
|
||||
|
@ -462,7 +458,11 @@ def _real_initialize(self):
|
|||
'ios': 'IOS',
|
||||
'ios_music': 'IOS_MUSIC',
|
||||
'_ios_embedded': 'IOS_MESSAGES_EXTENSION',
|
||||
'_ios_agegate': 'IOS'
|
||||
'_ios_agegate': 'IOS',
|
||||
'web': 'WEB',
|
||||
'web_music': 'WEB_REMIX',
|
||||
'_web_embedded': 'WEB_EMBEDDED_PLAYER',
|
||||
'_web_agegate': 'TVHTML5',
|
||||
}
|
||||
|
||||
def _get_default_ytcfg(self, client='WEB'):
|
||||
|
@ -2430,8 +2430,15 @@ def _extract_age_gated_player_response(self, client, video_id, ytcfg, identity_t
|
|||
identity_token, player_url, initial_pr)
|
||||
|
||||
def _get_requested_clients(self, url, smuggled_data):
|
||||
requested_clients = [client for client in self._configuration_arg('player_client')
|
||||
if client[:0] != '_' and client in self._YT_CLIENTS]
|
||||
requested_clients = []
|
||||
allowed_clients = [client for client in self._YT_CLIENTS.keys() if client[:1] != '_']
|
||||
for client in self._configuration_arg('player_client'):
|
||||
if client in allowed_clients:
|
||||
requested_clients.append(client)
|
||||
elif client == 'all':
|
||||
requested_clients.extend(allowed_clients)
|
||||
else:
|
||||
self.report_warning(f'Skipping unsupported client {client}')
|
||||
if not requested_clients:
|
||||
requested_clients = ['android', 'web']
|
||||
|
||||
|
|
Loading…
Reference in a new issue