mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-05-10 16:05:45 -05:00
Code Activity

chore: replace hard-coded limit with command line option

Browse source
This commit is contained in:
Adam Miller 2025-01-22 16:17:40 -08:00
parent 050b6c1f29
commit 148b36a039
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yt_dlp/YoutubeDL.py
View file

@ -1822,17 +1822,17 @@ def process_ie_result(self, ie_result, download=True, extra_info=None):
result_type = ie_result.get('_type', 'video') result_type = ie_result.get('_type', 'video')
if result_type in ('url', 'url_transparent'): if result_type in ('url', 'url_transparent'):
if 'extraction_depth' in extra_info: if self.params.get('max_extraction_depth', -1) > 0:
extra_info['extraction_depth'] = 1 + extra_info.get('extraction_depth', 0) if 'extraction_depth' in extra_info:
else: extra_info['extraction_depth'] = 1 + extra_info.get('extraction_depth', 0)
extra_info['extraction_depth'] = 0 else:
extra_info['extraction_depth'] = 0
# TODO: make command line arg with large or infinite default if extra_info['extraction_depth'] >= self.params.get('max_extraction_depth'):
if extra_info['extraction_depth'] >= 20: raise ExtractorError(
raise ExtractorError( f"Reached maximum extraction depth for URL: {ie_result['url']}",
f"Too many hops for URL: {ie_result['url']}", expected=True,
expected=True, )
)
ie_result['url'] = sanitize_url( ie_result['url'] = sanitize_url(
ie_result['url'], scheme='http' if self.params.get('prefer_insecure') else 'https') ie_result['url'], scheme='http' if self.params.get('prefer_insecure') else 'https')

2
yt_dlp/__init__.py
View file

@ -268,6 +268,7 @@ def parse_retries(name, value):
opts.retries = parse_retries('download', opts.retries) opts.retries = parse_retries('download', opts.retries)
opts.fragment_retries = parse_retries('fragment', opts.fragment_retries) opts.fragment_retries = parse_retries('fragment', opts.fragment_retries)
opts.extractor_retries = parse_retries('extractor', opts.extractor_retries) opts.extractor_retries = parse_retries('extractor', opts.extractor_retries)
opts.max_extraction_depth = parse_retries('extractor', opts.max_extraction_depth)
opts.file_access_retries = parse_retries('file access', opts.file_access_retries) opts.file_access_retries = parse_retries('file access', opts.file_access_retries)
# Retry sleep function # Retry sleep function
@ -841,6 +842,7 @@ def parse_options(argv=None):
'file_access_retries': opts.file_access_retries, 'file_access_retries': opts.file_access_retries,
'fragment_retries': opts.fragment_retries, 'fragment_retries': opts.fragment_retries,
'extractor_retries': opts.extractor_retries, 'extractor_retries': opts.extractor_retries,
'max_extraction_depth': opts.max_extraction_depth,
'retry_sleep_functions': opts.retry_sleep, 'retry_sleep_functions': opts.retry_sleep,
'skip_unavailable_fragments': opts.skip_unavailable_fragments, 'skip_unavailable_fragments': opts.skip_unavailable_fragments,
'keep_fragments': opts.keep_fragments, 'keep_fragments': opts.keep_fragments,

5
yt_dlp/options.py
View file

@ -1883,6 +1883,11 @@ def _alias_callback(option, opt_str, value, parser, opts, nargs):
'--extractor-retries', '--extractor-retries',
dest='extractor_retries', metavar='RETRIES', default=3, dest='extractor_retries', metavar='RETRIES', default=3,
help='Number of retries for known extractor errors (default is %default), or "infinite"') help='Number of retries for known extractor errors (default is %default), or "infinite"')
extractor.add_option(
'--max-extraction-depth',
dest='max_extraction_depth', default=-1,
help='Maximum depth when recursing into non-video url chains (default is unlimited)',
)
extractor.add_option( extractor.add_option(
'--allow-dynamic-mpd', '--no-ignore-dynamic-mpd', '--allow-dynamic-mpd', '--no-ignore-dynamic-mpd',
action='store_true', dest='dynamic_mpd', default=True, action='store_true', dest='dynamic_mpd', default=True,