mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-12-09 09:45:19 +00:00
Code Issues Projects Releases Wiki Activity

Improve extractor_args parsing

Browse Source
This commit is contained in:
pukkandan
2021-07-08 21:03:13 +05:30
parent b5ac45b197
commit 4bb6b02f93
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yt_dlp/extractor/common.py
View File

@@ -3498,9 +3498,18 @@ class InfoExtractor(object):
else 'public' if all_known
else None)
def _configuration_arg(self, key):
return traverse_obj(
def _configuration_arg(self, key, default=NO_DEFAULT, casesense=False):
'''
@returns A list of values for the extractor argument given by "key"
or "default" if no such key is present
@param default The default value to return when the key is not present (default: [])
@param casesense When false, the values are converted to lower case
'''
val = traverse_obj(
self._downloader.params, ('extractor_args', self.ie_key().lower(), key))
if val is None:
return [] if default is NO_DEFAULT else default
return list(val) if casesense else [x.lower() for x in val]
class SearchInfoExtractor(InfoExtractor):

4
yt_dlp/extractor/funimation.py
View File

@@ -186,8 +186,8 @@ class FunimationIE(InfoExtractor):
for lang, version, fmt in self._get_experiences(episode):
experience_id = str(fmt['experienceId'])
if (only_initial_experience and experience_id != initial_experience_id
or requested_languages and lang not in requested_languages
or requested_versions and version not in requested_versions):
or requested_languages and lang.lower() not in requested_languages
or requested_versions and version.lower() not in requested_versions):
continue
thumbnails.append({'url': fmt.get('poster')})
duration = max(duration, fmt.get('duration', 0))

12
yt_dlp/extractor/youtube.py
View File

@@ -2207,11 +2207,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
player_url = self._extract_player_url(ytcfg, webpage)
player_client = try_get(self._configuration_arg('player_client'), lambda x: x[0], str) or ''
if player_client.upper() not in ('WEB', 'ANDROID'):
player_client = 'WEB'
force_mobile_client = player_client.upper() == 'ANDROID'
player_skip = self._configuration_arg('player_skip') or []
player_client = (self._configuration_arg('player_client') or [''])[0]
if player_client not in ('web', 'android', ''):
self.report_warning(f'Invalid player_client {player_client} given. Falling back to WEB')
force_mobile_client = player_client == 'android'
player_skip = self._configuration_arg('player_skip')
def get_text(x):
if not x:
@@ -2489,7 +2489,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
dct['container'] = dct['ext'] + '_dash'
formats.append(dct)
skip_manifests = self._configuration_arg('skip') or []
skip_manifests = self._configuration_arg('skip')
get_dash = 'dash' not in skip_manifests and self.get_param('youtube_include_dash_manifest', True)
get_hls = 'hls' not in skip_manifests and self.get_param('youtube_include_hls_manifest', True)