When a redirect is found return the new url using the new style

This commit is contained in:
Jaime Marquínez Ferrándiz 2013-03-05 22:33:32 +01:00
parent 8a38a194fb
commit a0d6fe7b92

View File

@ -1311,7 +1311,7 @@ def report_following_redirect(self, new_url):
self._downloader.to_screen(u'[redirect] Following redirect to %s' % new_url) self._downloader.to_screen(u'[redirect] Following redirect to %s' % new_url)
def _test_redirect(self, url): def _test_redirect(self, url):
"""Check if it is a redirect, like url shorteners, in case restart chain.""" """Check if it is a redirect, like url shorteners, in case return the new url."""
class HeadRequest(compat_urllib_request.Request): class HeadRequest(compat_urllib_request.Request):
def get_method(self): def get_method(self):
return "HEAD" return "HEAD"
@ -1362,11 +1362,11 @@ def http_error_405(self, req, fp, code, msg, headers):
return False return False
self.report_following_redirect(new_url) self.report_following_redirect(new_url)
self._downloader.download([new_url]) return new_url
return True
def _real_extract(self, url): def _real_extract(self, url):
if self._test_redirect(url): return new_url = self._test_redirect(url)
if new_url: return [self.url_result(new_url)]
video_id = url.split('/')[-1] video_id = url.split('/')[-1]
request = compat_urllib_request.Request(url) request = compat_urllib_request.Request(url)