diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-03-25 01:07:47 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-03-25 01:07:47 +0100 |
| commit | c23d8a74dcf54df1cd4df95323897c0d5070d8a9 (patch) | |
| tree | f0d2d01e9919cf9b70e8b11d27f32a3d0dfaeb2c /youtube_dl | |
| parent | 6af22cf0efe393825534e19f82e3282a53625d19 (diff) | |
| parent | 74a5ff5f43fcdf4e1de2375b3edabd69ee78ebae (diff) | |
Merge branch 'next-url'
Diffstat (limited to 'youtube_dl')
| -rwxr-xr-x | youtube_dl/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 5a595901c..8d0d1cc33 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -1176,6 +1176,7 @@ class YoutubeIE(InfoExtractor): _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1' _LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en' _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en' + _NEXT_URL_RE = r'[\?&]next_url=([^&]+)' _NETRC_MACHINE = 'youtube' # Listed in order of quality _available_formats = ['38', '37', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13'] @@ -1336,6 +1337,11 @@ class YoutubeIE(InfoExtractor): return def _real_extract(self, url): + # Extract original video URL from URL with redirection, like age verification, using next_url parameter + mobj = re.search(self._NEXT_URL_RE, url) + if mobj: + url = 'http://www.youtube.com/' + urllib.unquote(mobj.group(1)).lstrip('/') + # Extract video id from URL mobj = re.match(self._VALID_URL, url) if mobj is None: @@ -4624,6 +4630,7 @@ def _real_main(): except IOError: sys.exit(u'ERROR: batch file could not be read') all_urls = batchurls + args + all_urls = map(lambda url: url.strip(), all_urls) # General configuration cookie_processor = urllib2.HTTPCookieProcessor(jar) |