w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[mtv] Transform the urls from the mobile version to get the best quality

Browse source 
And don't report a warning, just log a message, it allows to pass the test from Europe.
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-03-08 22:06:28 +01:00
parent a496524db2
commit 0ef68e04d9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/mtv.py
View file

@ -9,6 +9,7 @@ from ..utils import (
ExtractorError,
find_xpath_attr,
fix_xml_ampersands,
HEADRequest,
unescapeHTML,
url_basename,
RegexNotFoundError,
@ -49,14 +50,19 @@ class MTVServicesInfoExtractor(InfoExtractor):
req.add_header('Youtubedl-user-agent', 'curl/7')
webpage = self._download_webpage(req, mtvn_id,
'Downloading mobile page')
url = unescapeHTML(self._search_regex(r'<a href="(http://metrics.+?)"', webpage, 'url'))
return [{'url': url,'ext': 'mp4',}]
metrics_url = unescapeHTML(self._search_regex(r'<a href="(http://metrics.+?)"', webpage, 'url'))
req = HEADRequest(metrics_url)
response = self._request_webpage(req, mtvn_id, 'Resolving url')
url = response.geturl()
# Transform the url to get the best quality:
url = re.sub(r'.+pxE=mp4', 'http://mtvnmobile.vo.llnwd.net/kip0/_pxn=0+_pxK=18639+_pxE=mp4', url, 1)
return [{'url': url,'ext': 'mp4'}]
def _extract_video_formats(self, mdoc, mtvn_id):
if re.match(r'.*/(error_country_block\.swf|geoblock\.mp4)$', mdoc.find('.//src').text) is not None:
if mtvn_id is not None and self._MOBILE_TEMPLATE is not None:
self._downloader.report_warning('The normal version is not '
'available from your country, trying with the mobile version')
self.to_screen('The normal version is not available from your '
'country, trying with the mobile version')
return self._extract_mobile_video_formats(mtvn_id)
raise ExtractorError('This video is not available from your country.',
expected=True)