projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8a1a60d
)
[tvplay] Bypass geo restriction
author
Sergey M․
<dstftw@gmail.com>
Tue, 19 Sep 2017 16:59:36 +0000
(23:59 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 19 Sep 2017 17:00:04 +0000
(
00:00
+0700)
youtube_dl/extractor/tvplay.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tvplay.py
b/youtube_dl/extractor/tvplay.py
index 99ff82a5d4f5c8c9f99b1d415edd9b2c4c3c0d7f..46132eda1f3700bc51df6633b96723b4b2874ebb 100644
(file)
--- a/
youtube_dl/extractor/tvplay.py
+++ b/
youtube_dl/extractor/tvplay.py
@@
-15,7
+15,9
@@
from ..utils import (
int_or_none,
parse_iso8601,
qualities,
int_or_none,
parse_iso8601,
qualities,
+ smuggle_url,
try_get,
try_get,
+ unsmuggle_url,
update_url_query,
)
update_url_query,
)
@@
-224,6
+226,9
@@
class TVPlayIE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
+ url, smuggled_data = unsmuggle_url(url, {})
+ self._initialize_geo_bypass(smuggled_data.get('geo_countries'))
+
video_id = self._match_id(url)
geo_country = self._search_regex(
r'https?://[^/]+\.([a-z]{2})', url,
video_id = self._match_id(url)
geo_country = self._search_regex(
r'https?://[^/]+\.([a-z]{2})', url,
@@
-426,4
+431,9
@@
class ViafreeIE(InfoExtractor):
r'currentVideo["\']\s*:\s*.+?["\']id["\']\s*:\s*["\'](\d{6,})',
webpage, 'video id')
r'currentVideo["\']\s*:\s*.+?["\']id["\']\s*:\s*["\'](\d{6,})',
webpage, 'video id')
- return self.url_result('mtg:%s' % video_id, TVPlayIE.ie_key())
+ return self.url_result(
+ smuggle_url(
+ 'mtg:%s' % video_id,
+ {'geo_countries': [
+ compat_urlparse.urlparse(url).netloc.rsplit('.', 1)[-1]]}),
+ ie=TVPlayIE.ie_key(), video_id=video_id)