fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[mtv] Improve detection of geoblocked videos

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-03-08 19:43:18 +01:00
parent 1060425cbb
commit cc1db7f9b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/extractor/mtv.py
View File

@ -40,8 +40,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
return thumb_node.attrib['url'] return thumb_node.attrib['url']
def _extract_video_formats(self, mdoc): def _extract_video_formats(self, mdoc):
if re.match(r'.*/error_country_block\.swf$', mdoc.find('.//src').text) is not None: if re.match(r'.*/(error_country_block\.swf|geoblock\.mp4)$', mdoc.find('.//src').text) is not None:
raise ExtractorError('This video is not available from your country.', expected=True) raise ExtractorError('This video is not available from your country.',
expected=True)
formats = [] formats = []
for rendition in mdoc.findall('.//rendition'): for rendition in mdoc.findall('.//rendition'):