From 203fb43f3602a6363041ee9323ee718e6c71606c Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 13 Oct 2014 00:03:08 +0200 Subject: [PATCH] [youtube] Download DASH manifest by default (Closes #3887) --- youtube_dl/extractor/youtube.py | 2 +- youtube_dl/options.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 9041cfa87..98d7fb5fc 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -938,7 +938,7 @@ def _map_to_format_list(urlmap): raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map information found in video info') # Look for the DASH manifest - if (self._downloader.params.get('youtube_include_dash_manifest', False)): + if self._downloader.params.get('youtube_include_dash_manifest', True): try: # The DASH manifest used needs to be the one from the original video_webpage. # The one found in get_video_info seems to be using different signatures. diff --git a/youtube_dl/options.py b/youtube_dl/options.py index a06850e1c..649361bde 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -225,10 +225,6 @@ def _hide_login_info(opts): '--include-ads', dest='include_ads', action='store_true', help='Download advertisements as well (experimental)') - selection.add_option( - '--youtube-include-dash-manifest', - action='store_true', dest='youtube_include_dash_manifest', default=False, - help='Try to download the DASH manifest on YouTube videos (experimental)') authentication = optparse.OptionGroup(parser, 'Authentication Options') authentication.add_option( @@ -273,6 +269,14 @@ def _hide_login_info(opts): '-F', '--list-formats', action='store_true', dest='listformats', help='list all available formats') + video_format.add_option( + '--youtube-include-dash-manifest', + action='store_true', dest='youtube_include_dash_manifest', default=True, + help=optparse.SUPPRESS_HELP) + video_format.add_option( + '--youtube-skip-dash-manifest', + action='store_false', dest='youtube_include_dash_manifest', + help='Do not download the DASH manifest on YouTube videos') subtitles = optparse.OptionGroup(parser, 'Subtitle Options') subtitles.add_option(