]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Retry to disable YT ratelimit to unlock full bandwidth
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Wed, 8 May 2013 22:39:10 +0000 (00:39 +0200)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Wed, 8 May 2013 22:39:10 +0000 (00:39 +0200)
This is the second attempt: a60b854d9099e5a286accf8065d1dc9e00a4bfe6
Sometimes the ratelimit=yes is already in the URL, and doubling it
leads to a 403. Now should work on all videos, at least works on all
I could test.

Closes #648

youtube_dl/InfoExtractors.py

index d66d64f00e5cb667eab63765cc4c34db83112031..ec52cbcff433ea0d75cd02a9b7343f83af07e99b 100755 (executable)
@@ -610,10 +610,13 @@ class YoutubeIE(InfoExtractor):
             self.report_rtmp_download()
             video_url_list = [(None, video_info['conn'][0])]
         elif '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 = [compat_parse_qs(uds) for uds in url_data_strs]
-            url_data = [ud for ud in url_data if 'itag' in ud and 'url' in ud]
-            url_map = dict((ud['itag'][0], ud['url'][0] + '&signature=' + ud['sig'][0]) for ud in url_data)
+            url_map = {}
+            for url_data_str in video_info['url_encoded_fmt_stream_map'][0].split(','):
+                url_data = compat_parse_qs(url_data_str)
+                if 'itag' in url_data and 'url' in url_data:
+                    url = url_data['url'][0] + '&signature=' + url_data['sig'][0]
+                    if not 'ratebypass' in url: url += '&ratebypass=yes'
+                    url_map[url_data['itag'][0]] = url
 
             format_limit = self._downloader.params.get('format_limit', None)
             available_formats = self._available_formats_prefer_free if self._downloader.params.get('prefer_free_formats', False) else self._available_formats