Browse Source

[mtv] Improve detection of geoblocked videos

master
Jaime Marquínez Ferrándiz 10 years ago
parent
commit
cc1db7f9b7
1 changed files with 3 additions and 2 deletions
  1. 5
      youtube_dl/extractor/mtv.py

5
youtube_dl/extractor/mtv.py

@ -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:
raise ExtractorError('This video is not available from your country.', expected=True)
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)
formats = [] formats = []
for rendition in mdoc.findall('.//rendition'): for rendition in mdoc.findall('.//rendition'):

Loading…
Cancel
Save