[discoverynetworks] add support for dplay.co.uk
This commit is contained in:
parent
42cd0824b3
commit
235dbb434b
@ -3,63 +3,38 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .brightcove import BrightcoveLegacyIE
|
|
||||||
from .dplay import DPlayIE
|
from .dplay import DPlayIE
|
||||||
from ..compat import (
|
|
||||||
compat_parse_qs,
|
|
||||||
compat_urlparse,
|
|
||||||
)
|
|
||||||
from ..utils import smuggle_url
|
|
||||||
|
|
||||||
|
|
||||||
class DiscoveryNetworksDeIE(DPlayIE):
|
class DiscoveryNetworksDeIE(DPlayIE):
|
||||||
_VALID_URL = r'''(?x)https?://(?:www\.)?(?P<site>discovery|tlc|animalplanet|dmax)\.de/
|
_VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:tlc|dmax)\.de|dplay\.co\.uk)/(?:programme|show)/(?P<programme>[^/]+)/video/(?P<alternate_id>[^/]+)'
|
||||||
(?:
|
|
||||||
.*\#(?P<id>\d+)|
|
|
||||||
(?:[^/]+/)*videos/(?P<display_id>[^/?#]+)|
|
|
||||||
programme/(?P<programme>[^/]+)/video/(?P<alternate_id>[^/]+)
|
|
||||||
)'''
|
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',
|
'url': 'https://www.tlc.de/programme/breaking-amish/video/die-welt-da-drauen/DCB331270001100',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '3235167922001',
|
'id': '78867',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Breaking Amish: Die Welt da draußen',
|
'title': 'Die Welt da draußen',
|
||||||
'description': (
|
'description': 'md5:61033c12b73286e409d99a41742ef608',
|
||||||
'Vier Amische und eine Mennonitin wagen in New York'
|
'timestamp': 1554069600,
|
||||||
' den Sprung in ein komplett anderes Leben. Begleitet sie auf'
|
'upload_date': '20190331',
|
||||||
' ihrem spannenden Weg.'),
|
},
|
||||||
'timestamp': 1396598084,
|
'params': {
|
||||||
'upload_date': '20140404',
|
'format': 'bestvideo',
|
||||||
'uploader_id': '1659832546',
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.dmax.de/programme/storage-hunters-uk/videos/storage-hunters-uk-episode-6/',
|
'url': 'https://www.dmax.de/programme/dmax-highlights/video/tuning-star-sidney-hoffmann-exklusiv-bei-dmax/191023082312316',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.discovery.de/#5332316765001',
|
'url': 'https://www.dplay.co.uk/show/ghost-adventures/video/hotel-leger-103620/EHD_280313B',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1659832546/default_default/index.html?videoId=%s'
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
domain, programme, alternate_id = re.match(self._VALID_URL, url).groups()
|
||||||
alternate_id = mobj.group('alternate_id')
|
country = 'GB' if domain == 'dplay.co.uk' else 'DE'
|
||||||
if alternate_id:
|
realm = 'questuk' if country == 'GB' else domain.replace('.', '')
|
||||||
self._initialize_geo_bypass({
|
return self._get_disco_api_info(
|
||||||
'countries': ['DE'],
|
url, '%s/%s' % (programme, alternate_id),
|
||||||
})
|
'sonic-eu1-prod.disco-api.com', realm, country)
|
||||||
return self._get_disco_api_info(
|
|
||||||
url, '%s/%s' % (mobj.group('programme'), alternate_id),
|
|
||||||
'sonic-eu1-prod.disco-api.com', mobj.group('site') + 'de')
|
|
||||||
brightcove_id = mobj.group('id')
|
|
||||||
if not brightcove_id:
|
|
||||||
title = mobj.group('title')
|
|
||||||
webpage = self._download_webpage(url, title)
|
|
||||||
brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
|
|
||||||
brightcove_id = compat_parse_qs(compat_urlparse.urlparse(
|
|
||||||
brightcove_legacy_url).query)['@videoPlayer'][0]
|
|
||||||
return self.url_result(smuggle_url(
|
|
||||||
self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, {'geo_countries': ['DE']}),
|
|
||||||
'BrightcoveNew', brightcove_id)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user