mirrors
/
youtube-dl
0
0
Fork 0
Code Releases 1 Activity

[dplay] Improve extraction and document workarounds and tests

main
Sergey M․ 2016-04-23 16:36:17 +06:00
parent 397ec446f3
commit fd0ff8bad8
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/dplay.py
View File

@ -13,6 +13,7 @@ class DPlayIE(InfoExtractor):
_VALID_URL = r'https?://(?P<domain>it\.dplay\.com|www\.dplay\.(?:dk|se|no))/[^/]+/(?P<id>[^/?#]+)' _VALID_URL = r'https?://(?P<domain>it\.dplay\.com|www\.dplay\.(?:dk|se|no))/[^/]+/(?P<id>[^/?#]+)'
_TESTS = [{ _TESTS = [{
# geo restricted, via direct unsigned hls URL
'url': 'http://it.dplay.com/take-me-out/stagione-1-episodio-25/', 'url': 'http://it.dplay.com/take-me-out/stagione-1-episodio-25/',
'info_dict': { 'info_dict': {
'id': '1255600', 'id': '1255600',
@ -31,6 +32,7 @@ class DPlayIE(InfoExtractor):
}, },
'expected_warnings': ['Unable to download f4m manifest'], 'expected_warnings': ['Unable to download f4m manifest'],
}, { }, {
# non geo restricted, via secure api
'url': 'http://www.dplay.se/nugammalt-77-handelser-som-format-sverige/season-1-svensken-lar-sig-njuta-av-livet/', 'url': 'http://www.dplay.se/nugammalt-77-handelser-som-format-sverige/season-1-svensken-lar-sig-njuta-av-livet/',
'info_dict': { 'info_dict': {
'id': '3172', 'id': '3172',
@ -48,6 +50,7 @@ class DPlayIE(InfoExtractor):
'age_limit': 0, 'age_limit': 0,
}, },
}, { }, {
# geo restricted, via secure api
'url': 'http://www.dplay.dk/mig-og-min-mor/season-6-episode-12/', 'url': 'http://www.dplay.dk/mig-og-min-mor/season-6-episode-12/',
'info_dict': { 'info_dict': {
'id': '70816', 'id': '70816',
@ -65,6 +68,7 @@ class DPlayIE(InfoExtractor):
'age_limit': 0, 'age_limit': 0,
}, },
}, { }, {
# geo restricted, via direct unsigned hls URL
'url': 'http://www.dplay.no/pga-tour/season-1-hoydepunkter-18-21-februar/', 'url': 'http://www.dplay.no/pga-tour/season-1-hoydepunkter-18-21-februar/',
'only_matching': True, 'only_matching': True,
}] }]
@ -101,6 +105,7 @@ class DPlayIE(InfoExtractor):
domain_tld = domain.split('.')[-1] domain_tld = domain.split('.')[-1]
if domain_tld in ('se', 'dk', 'no'): if domain_tld in ('se', 'dk', 'no'):
for protocol in PROTOCOLS: for protocol in PROTOCOLS:
# Providing dsc-geo allows to bypass geo restriction in some cases
self._set_cookie( self._set_cookie(
'secure.dplay.%s' % domain_tld, 'dsc-geo', 'secure.dplay.%s' % domain_tld, 'dsc-geo',
json.dumps({ json.dumps({
@ -113,7 +118,11 @@ class DPlayIE(InfoExtractor):
'Downloading %s stream JSON' % protocol, fatal=False) 'Downloading %s stream JSON' % protocol, fatal=False)
if stream and stream.get(protocol): if stream and stream.get(protocol):
extract_formats(protocol, stream[protocol]) extract_formats(protocol, stream[protocol])
else:
# The last resort is to try direct unsigned hls/hds URLs from info dictionary.
# Sometimes this does work even when secure API with dsc-geo has failed (e.g.
# http://www.dplay.no/pga-tour/season-1-hoydepunkter-18-21-februar/).
if not formats:
for protocol in PROTOCOLS: for protocol in PROTOCOLS:
if info.get(protocol): if info.get(protocol):
extract_formats(protocol, info[protocol]) extract_formats(protocol, info[protocol])