github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

Merge https://github.com/rg3/youtube-dl into prefer-webm

Browse source
This commit is contained in:
Rogério Brito 2011-08-04 17:44:33 -03:00
parent 43c0a396a2 33d507f1fe
commit 05b4029662
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LATEST_VERSION
View file

@ -1 +1 @@
2011.03.29 2011.08.04

10
youtube-dl
View file

@ -38,7 +38,7 @@ except ImportError:
from cgi import parse_qs from cgi import parse_qs
std_headers = { std_headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20100101 Firefox/4.0b11', 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1',
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Encoding': 'gzip, deflate', 'Accept-Encoding': 'gzip, deflate',
@ -1079,8 +1079,10 @@ 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)
if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1 and ',' in video_info['fmt_url_map'][0]: if 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1:
url_map = dict(tuple(pair.split('|')) for pair in video_info['fmt_url_map'][0].split(',')) url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',')
url_data = [dict(pairStr.split('=') for pairStr in uds.split('&')) for uds in url_data_strs]
url_map = dict((ud['itag'], urllib.unquote(ud['url'])) for ud in url_data)
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):]
@ -2723,7 +2725,7 @@ if __name__ == '__main__':
# Parse command line # Parse command line
parser = optparse.OptionParser( parser = optparse.OptionParser(
usage='Usage: %prog [options] url...', usage='Usage: %prog [options] url...',
version='2011.03.29', version='2011.08.04',
conflict_handler='resolve', conflict_handler='resolve',
) )