Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix youtube downloads (Closes #135)

pull/130/merge^2
Philipp Hagemeister 2011-08-04 00:04:55 +02:00
parent c31b124d7a
commit 0ac22e4f5a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube-dl
View File

@ -1248,14 +1248,11 @@ class YoutubeIE(InfoExtractor):
# Decide which formats to download # Decide which formats to download
req_format = self._downloader.params.get('format', None) req_format = self._downloader.params.get('format', None)
raw_map = None if 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1:
if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1: url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',')
raw_map = video_info['fmt_url_map'][0] url_data = [dict(pairStr.split('=') for pairStr in uds.split('&')) for uds in url_data_strs]
elif 'fmt_stream_map' in video_info and len(video_info['fmt_stream_map']) >= 1: url_map = dict((ud['itag'], urllib.unquote(ud['url'])) for ud in url_data)
raw_map = video_info['fmt_stream_map'][0]
if raw_map is not None:
url_map = dict(tuple(pair.split('|')[:2]) for pair in raw_map.split(','))
format_limit = self._downloader.params.get('format_limit', None) format_limit = self._downloader.params.get('format_limit', None)
if format_limit is not None and format_limit in self._available_formats: if format_limit is not None and format_limit in self._available_formats:
format_list = self._available_formats[self._available_formats.index(format_limit):] format_list = self._available_formats[self._available_formats.index(format_limit):]