Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-02-24 16:49:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'adam/patch-yt-dlp-infinite-loop-bug' into qa

Browse Source
This commit is contained in:
Adam Miller 2025-01-15 12:02:34 -08:00
commit 2de96eae25
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
brozzler/ydl.py
View File

@ -123,24 +123,24 @@ def _build_youtube_dl(worker, destdir, site, page):
def process_ie_result(self, ie_result, download=True, extra_info=None): def process_ie_result(self, ie_result, download=True, extra_info=None):
if extra_info is None: if extra_info is None:
extra_info = {} extra_info = {}
if ( result_type = ie_result.get("_type", "video")
"redirect_count" in extra_info
and "_type" in ie_result
and ie_result.get("_type") in ("url", "url_transparent")
):
self.logger.info(
f"Following redirect URL: {ie_result['url']} redirect_count: {extra_info['redirect_count']}"
)
extra_info["redirect_count"] = 1 + extra_info.get("redirect_count", 0)
else:
extra_info["redirect_count"] = 0
if extra_info["redirect_count"] > YTDLP_MAX_REDIRECTS:
raise ExtractorError(
f"Too many redirects for URL: {ie_result['url']}",
expected=True,
)
super().process_ie_result(ie_result, download, extra_info) if result_type in ("url", "url_transparent"):
if "extraction_depth" in extra_info:
self.logger.info(
f"Following redirect URL: {ie_result['url']} extraction_depth: {extra_info['extraction_depth']}"
)
extra_info["extraction_depth"] = 1 + extra_info.get(
"extraction_depth", 0
)
else:
extra_info["extraction_depth"] = 0
if extra_info["extraction_depth"] >= YTDLP_MAX_REDIRECTS:
raise ExtractorError(
f"Too many hops for URL: {ie_result['url']}",
expected=True,
)
return super().process_ie_result(ie_result, download, extra_info)
def add_default_extra_info(self, ie_result, ie, url): def add_default_extra_info(self, ie_result, ie, url):
# hook in some logging # hook in some logging