projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Add support for DASH manifests with SegmentLists with bare SegmentURLs
[youtube-dl]
/
youtube_dl
/
extractor
/
tvplay.py
diff --git
a/youtube_dl/extractor/tvplay.py
b/youtube_dl/extractor/tvplay.py
index 5548ff2acc0e0bd39051d69acaddd86dd96e3c4e..46132eda1f3700bc51df6633b96723b4b2874ebb 100644
(file)
--- a/
youtube_dl/extractor/tvplay.py
+++ b/
youtube_dl/extractor/tvplay.py
@@
-15,8
+15,9
@@
from ..utils import (
int_or_none,
parse_iso8601,
qualities,
int_or_none,
parse_iso8601,
qualities,
+ smuggle_url,
try_get,
try_get,
-
js_to_json
,
+
unsmuggle_url
,
update_url_query,
)
update_url_query,
)
@@
-225,8
+226,15
@@
class TVPlayIE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
- video_id = self._match_id(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,
+ 'geo country', default=None)
+ if geo_country:
+ self._initialize_geo_bypass([geo_country.upper()])
video = self._download_json(
'http://playapi.mtgx.tv/v3/videos/%s' % video_id, video_id, 'Downloading video JSON')
video = self._download_json(
'http://playapi.mtgx.tv/v3/videos/%s' % video_id, video_id, 'Downloading video JSON')
@@
-370,7
+378,7
@@
class ViafreeIE(InfoExtractor):
'add_ie': [TVPlayIE.ie_key()],
}, {
# Different og:image URL schema
'add_ie': [TVPlayIE.ie_key()],
}, {
# Different og:image URL schema
- 'url': 'www.viafree.se/program/reality/sommaren-med-youtube-stjarnorna/sasong-1/avsnitt-2',
+ 'url': '
http://
www.viafree.se/program/reality/sommaren-med-youtube-stjarnorna/sasong-1/avsnitt-2',
'only_matching': True,
}, {
'url': 'http://www.viafree.no/programmer/underholdning/det-beste-vorspielet/sesong-2/episode-1',
'only_matching': True,
}, {
'url': 'http://www.viafree.no/programmer/underholdning/det-beste-vorspielet/sesong-2/episode-1',
@@
-423,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)