projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86466a8
)
[tfo] Improve geo restriction detection and use geo bypass mechanism
author
Remita Amine
<remitamine@gmail.com>
Tue, 21 Feb 2017 16:51:40 +0000
(17:51 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Tue, 21 Feb 2017 16:52:50 +0000
(17:52 +0100)
youtube_dl/extractor/tfo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tfo.py
b/youtube_dl/extractor/tfo.py
index 6f1eeac57bf67e5be4ab6fd45b88ca0d13c01f5c..0e2370cd828f78a2e1a708852a392a05d96e3039 100644
(file)
--- a/
youtube_dl/extractor/tfo.py
+++ b/
youtube_dl/extractor/tfo.py
@@
-8,10
+8,12
@@
from ..utils import (
HEADRequest,
ExtractorError,
int_or_none,
HEADRequest,
ExtractorError,
int_or_none,
+ clean_html,
)
class TFOIE(InfoExtractor):
)
class TFOIE(InfoExtractor):
+ _GEO_COUNTRIES = ['CA']
_VALID_URL = r'https?://(?:www\.)?tfo\.org/(?:en|fr)/(?:[^/]+/){2}(?P<id>\d+)'
_TEST = {
'url': 'http://www.tfo.org/en/universe/tfo-247/100463871/video-game-hackathon',
_VALID_URL = r'https?://(?:www\.)?tfo\.org/(?:en|fr)/(?:[^/]+/){2}(?P<id>\d+)'
_TEST = {
'url': 'http://www.tfo.org/en/universe/tfo-247/100463871/video-game-hackathon',
@@
-36,7
+38,9
@@
class TFOIE(InfoExtractor):
'X-tfo-session': self._get_cookies('http://www.tfo.org/')['tfo-session'].value,
})
if infos.get('success') == 0:
'X-tfo-session': self._get_cookies('http://www.tfo.org/')['tfo-session'].value,
})
if infos.get('success') == 0:
- raise ExtractorError('%s said: %s' % (self.IE_NAME, infos['msg']), expected=True)
+ if infos.get('code') == 'ErrGeoBlocked':
+ self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
+ raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(infos['msg'])), expected=True)
video_data = infos['data']
return {
video_data = infos['data']
return {