Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: select best stream by bandwidth (HLS) (#2009)
NTFSvolume2f4f08a677c0
diff --git a/cyberdrop_dl/utils/_url.py b/cyberdrop_dl/utils/_url.pyindex 105db98aa..7be0a5ebb 100644--- a/cyberdrop_dl/utils/_url.py+++ b/cyberdrop_dl/utils/_url.py@@ -61,8 +61,6 @@ def check_url(url: yarl.URL) -> None:raise ValueError("URL has no host", url)if "." not in url.host and url.host != "localhost":raise ValueError("URL has no TLD", url)- if len(str(url)) > 2083:- raise ValueError("URL is too long")def remove_trailing_slash(url: AbsoluteHttpURL) -> AbsoluteHttpURL:diff --git a/cyberdrop_dl/utils/m3u8.py b/cyberdrop_dl/utils/m3u8.pyindex 3246359b2..1f6dcacab 100644--- a/cyberdrop_dl/utils/m3u8.py+++ b/cyberdrop_dl/utils/m3u8.py@@ -122,11 +122,8 @@ class RenditionDetails:video_url = get_url(playlist)subtitle_url = audio_url = None- if playlist.stream_info.resolution is not None:- resolution: Resolution = Resolution(*playlist.stream_info.resolution)- else:- resolution = get_resolution_from_url(video_url)-+ stream_info = StreamInfo(**vars(playlist.stream_info))+ resolution = _parse_stream_resolution(stream_info, video_url)codecs = Codecs.parse(playlist.stream_info.codecs)media = MediaList(playlist.media)@@ -139,10 +136,21 @@ class RenditionDetails:subtitle_url: AbsoluteHttpURL | None = get_url(subtitle)media_urls = MediaURLs(video_url, audio_url, subtitle_url)- stream_info = StreamInfo(**vars(playlist.stream_info))+return RenditionDetails(resolution, codecs, stream_info, media, media_urls)+def _parse_stream_resolution(stream_info: StreamInfo, video_url: AbsoluteHttpURL) -> Resolution:+ if stream_info.resolution is not None:+ return Resolution(*stream_info.resolution)+ try:+ return get_resolution_from_url(video_url)+ except RuntimeError:+ if stream_info.bandwidth is None:+ raise ValueError("Stream has no resolution or bandwidth information") from None+ return Resolution.unknown()++class M3U8(_M3U8):def __init__(self,diff --git a/tests/test_m3u8.py b/tests/test_m3u8.pyindex 397f10784..839c207c5 100644--- a/tests/test_m3u8.py+++ b/tests/test_m3u8.py@@ -3,6 +3,7 @@ from typing import LiteralStringimport pytest+from cyberdrop_dl.mediaprops import Resolutionfrom cyberdrop_dl.url_objects import AbsoluteHttpURLfrom cyberdrop_dl.utils import m3u8@@ -210,3 +211,27 @@ def test_m3u8_master_w_no_codecs_should_not_raise_an_error() -> None:assert len(groups) == 2for group in groups:assert group.codecs == (None, None)+++def test_m3u8_selection_of_streams_w_no_resolution() -> None:+ content = """+ #EXTM3U+ #EXT-X-VERSION:5+ #EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio",LANGUAGE="es",NAME="English [Original]",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="audio/audio/English/audio.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7327812"+ #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1042180,AUDIO="audio"+ 1042180/playlist.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7360e2d2+ #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1577180,AUDIO="audio"+ 1577180/playlist.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7360e2d2+ #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=2294080,AUDIO="audio"+ 2294080/playlist.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7360e2d2+ #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=3321280,AUDIO="audio"+ 3321280/playlist.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7360e2d2+ #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=640930,AUDIO="audio"+ 640930/playlist.m3u8?sid=78b48d12-79ec-11f1-a9b4-761d7360e2d2+ """+ variant = _variant_parser(content)+ best = variant.get_best_group()+ assert best.resolution == Resolution.unknown()+ assert best.stream_info.bandwidth == 3321280+ assert best.media.filter(group_id="audio")+ assert best.urls.video.path == "/4b4ef277/3321280/playlist.m3u8"