projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65488b8
)
[mtvservices] Catch more georestriction errors
author
Sergey M․
<dstftw@gmail.com>
Fri, 28 Aug 2015 15:45:29 +0000
(21:45 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 28 Aug 2015 15:45:29 +0000
(21:45 +0600)
youtube_dl/extractor/mtv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mtv.py
b/youtube_dl/extractor/mtv.py
index d160f4a220aa0e264b1d05a4154cd83d049b4416..4e4358151e9c041f3c608eeaf5643a5afb90153a 100644
(file)
--- a/
youtube_dl/extractor/mtv.py
+++ b/
youtube_dl/extractor/mtv.py
@@
-67,7
+67,7
@@
class MTVServicesInfoExtractor(InfoExtractor):
return [{'url': url, 'ext': 'mp4'}]
def _extract_video_formats(self, mdoc, mtvn_id):
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 re.match(r'.*/(error_country_block\.swf|geoblock\.mp4
|copyright_error\.flv(?:\?geo\b.+?)?
)$', mdoc.find('.//src').text) is not None:
if mtvn_id is not None and self._MOBILE_TEMPLATE is not None:
self.to_screen('The normal version is not available from your '
'country, trying with the mobile version')
if mtvn_id is not None and self._MOBILE_TEMPLATE is not None:
self.to_screen('The normal version is not available from your '
'country, trying with the mobile version')