From 8126094cf14dd35c00b59a0435ac34fc0ee9ef57 Mon Sep 17 00:00:00 2001
From: Ricardo Garcia <commits@rg3.name>
Date: Thu, 4 Aug 2011 19:13:02 +0200
Subject: [PATCH 1/3] Fix YouTube downloads (code by Philipp Hagemeister)
---
youtube-dl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/youtube-dl b/youtube-dl
index 3ac27a857..d9307216b 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1079,8 +1079,10 @@ class YoutubeIE(InfoExtractor):
# Decide which formats to download
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]:
- url_map = dict(tuple(pair.split('|')) for pair in video_info['fmt_url_map'][0].split(','))
+ if 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1:
+ 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)
if format_limit is not None and format_limit in self._available_formats:
format_list = self._available_formats[self._available_formats.index(format_limit):]
From c44b9ee95e577ebe3a9ba6d69b8c5cef0d445acc Mon Sep 17 00:00:00 2001
From: Ricardo Garcia <commits@rg3.name>
Date: Thu, 4 Aug 2011 19:14:19 +0200
Subject: [PATCH 2/3] Update User-Agent string
---
youtube-dl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube-dl b/youtube-dl
index d9307216b..892af57cf 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -38,7 +38,7 @@ except ImportError:
from cgi import parse_qs
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': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Encoding': 'gzip, deflate',
From 33d507f1fe828b186dec9b61ff4fc6b5fdcf42b2 Mon Sep 17 00:00:00 2001
From: Ricardo Garcia <commits@rg3.name>
Date: Thu, 4 Aug 2011 19:15:14 +0200
Subject: [PATCH 3/3] Bump version number
---
LATEST_VERSION | 2 +-
youtube-dl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LATEST_VERSION b/LATEST_VERSION
index 295c9c4fa..8a3bb049a 100644
--- a/LATEST_VERSION
+++ b/LATEST_VERSION
@@ -1 +1 @@
-2011.03.29
+2011.08.04
diff --git a/youtube-dl b/youtube-dl
index 892af57cf..e8b19c8d0 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -2725,7 +2725,7 @@ if __name__ == '__main__':
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2011.03.29',
+ version='2011.08.04',
conflict_handler='resolve',
)