Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[youtube] Download DASH manifest by default (Closes #3887)

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-10-13 00:03:08 +02:00
parent 4d7b03f1f2
commit 203fb43f36
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/youtube.py
View File

@ -938,7 +938,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map information found in video info') raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map information found in video info')
# Look for the DASH manifest # 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: try:
# The DASH manifest used needs to be the one from the original video_webpage. # 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. # The one found in get_video_info seems to be using different signatures.

12
youtube_dl/options.py
View File

@ -225,10 +225,6 @@ def parseOpts(overrideArguments=None):
'--include-ads', '--include-ads',
dest='include_ads', action='store_true', dest='include_ads', action='store_true',
help='Download advertisements as well (experimental)') 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 = optparse.OptionGroup(parser, 'Authentication Options')
authentication.add_option( authentication.add_option(
@ -273,6 +269,14 @@ def parseOpts(overrideArguments=None):
'-F', '--list-formats', '-F', '--list-formats',
action='store_true', dest='listformats', action='store_true', dest='listformats',
help='list all available formats') 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 = optparse.OptionGroup(parser, 'Subtitle Options')
subtitles.add_option( subtitles.add_option(