diff options
| -rw-r--r-- | yt_dlp/extractor/dplay.py | 145 |
1 files changed, 84 insertions, 61 deletions
diff --git a/yt_dlp/extractor/dplay.py b/yt_dlp/extractor/dplay.py index 6a245c1f0..7a00db7b0 100644 --- a/yt_dlp/extractor/dplay.py +++ b/yt_dlp/extractor/dplay.py @@ -347,33 +347,7 @@ class HGTVDeIE(DPlayBaseIE): url, display_id, 'eu1-prod.disco-api.com', 'hgtv', 'de') -class DiscoveryPlusIE(DPlayBaseIE): - _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:\w{2}/)?video' + DPlayBaseIE._PATH_REGEX - _TESTS = [{ - 'url': 'https://www.discoveryplus.com/video/property-brothers-forever-home/food-and-family', - 'info_dict': { - 'id': '1140794', - 'display_id': 'property-brothers-forever-home/food-and-family', - 'ext': 'mp4', - 'title': 'Food and Family', - 'description': 'The brothers help a Richmond family expand their single-level home.', - 'duration': 2583.113, - 'timestamp': 1609304400, - 'upload_date': '20201230', - 'creator': 'HGTV', - 'series': 'Property Brothers: Forever Home', - 'season_number': 1, - 'episode_number': 1, - }, - 'skip': 'Available for Premium users', - }, { - 'url': 'https://discoveryplus.com/ca/video/bering-sea-gold-discovery-ca/goldslingers', - 'only_matching': True, - }] - - _PRODUCT = 'dplus_us' - _API_URL = 'us1-prod-direct.discoveryplus.com' - +class DiscoveryPlusBaseIE(DPlayBaseIE): def _update_disco_api_headers(self, headers, disco_base, display_id, realm): headers['x-disco-client'] = f'WEB:UNKNOWN:{self._PRODUCT}:25.2.6' @@ -392,12 +366,10 @@ class DiscoveryPlusIE(DPlayBaseIE): }).encode('utf-8'))['data']['attributes']['streaming'] def _real_extract(self, url): - display_id = self._match_id(url) - return self._get_disco_api_info( - url, display_id, self._API_URL, 'go', 'us') + return self._get_disco_api_info(url, self._match_id(url), **self._DISCO_API_PARAMS) -class ScienceChannelIE(DiscoveryPlusIE): +class ScienceChannelIE(DiscoveryPlusBaseIE): _VALID_URL = r'https?://(?:www\.)?sciencechannel\.com/video' + DPlayBaseIE._PATH_REGEX _TESTS = [{ 'url': 'https://www.sciencechannel.com/video/strangest-things-science-atve-us/nazi-mystery-machine', @@ -414,10 +386,14 @@ class ScienceChannelIE(DiscoveryPlusIE): }] _PRODUCT = 'sci' - _API_URL = 'us1-prod-direct.sciencechannel.com' + _DISCO_API_PARAMS = { + 'disco_host': 'us1-prod-direct.sciencechannel.com', + 'realm': 'go', + 'country': 'us', + } -class DIYNetworkIE(DiscoveryPlusIE): +class DIYNetworkIE(DiscoveryPlusBaseIE): _VALID_URL = r'https?://(?:watch\.)?diynetwork\.com/video' + DPlayBaseIE._PATH_REGEX _TESTS = [{ 'url': 'https://watch.diynetwork.com/video/pool-kings-diy-network/bringing-beach-life-to-texas', @@ -434,10 +410,14 @@ class DIYNetworkIE(DiscoveryPlusIE): }] _PRODUCT = 'diy' - _API_URL = 'us1-prod-direct.watch.diynetwork.com' + _DISCO_API_PARAMS = { + 'disco_host': 'us1-prod-direct.watch.diynetwork.com', + 'realm': 'go', + 'country': 'us', + } -class AnimalPlanetIE(DiscoveryPlusIE): +class AnimalPlanetIE(DiscoveryPlusBaseIE): _VALID_URL = r'https?://(?:www\.)?animalplanet\.com/video' + DPlayBaseIE._PATH_REGEX _TESTS = [{ 'url': 'https://www.animalplanet.com/video/north-woods-law-animal-planet/squirrel-showdown', @@ -454,10 +434,46 @@ class AnimalPlanetIE(DiscoveryPlusIE): }] _PRODUCT = 'apl' - _API_URL = 'us1-prod-direct.animalplanet.com' + _DISCO_API_PARAMS = { + 'disco_host': 'us1-prod-direct.animalplanet.com', + 'realm': 'go', + 'country': 'us', + } + + +class DiscoveryPlusIE(DiscoveryPlusBaseIE): + _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:\w{2}/)?video' + DPlayBaseIE._PATH_REGEX + _TESTS = [{ + 'url': 'https://www.discoveryplus.com/video/property-brothers-forever-home/food-and-family', + 'info_dict': { + 'id': '1140794', + 'display_id': 'property-brothers-forever-home/food-and-family', + 'ext': 'mp4', + 'title': 'Food and Family', + 'description': 'The brothers help a Richmond family expand their single-level home.', + 'duration': 2583.113, + 'timestamp': 1609304400, + 'upload_date': '20201230', + 'creator': 'HGTV', + 'series': 'Property Brothers: Forever Home', + 'season_number': 1, + 'episode_number': 1, + }, + 'skip': 'Available for Premium users', + }, { + 'url': 'https://discoveryplus.com/ca/video/bering-sea-gold-discovery-ca/goldslingers', + 'only_matching': True, + }] + + _PRODUCT = 'dplus_us' + _DISCO_API_PARAMS = { + 'disco_host': 'us1-prod-direct.discoveryplus.com', + 'realm': 'go', + 'country': 'us', + } -class DiscoveryPlusIndiaIE(DPlayBaseIE): +class DiscoveryPlusIndiaIE(DiscoveryPlusBaseIE): _VALID_URL = r'https?://(?:www\.)?discoveryplus\.in/videos?' + DPlayBaseIE._PATH_REGEX _TESTS = [{ 'url': 'https://www.discoveryplus.in/videos/how-do-they-do-it/fugu-and-more?seasonId=8&type=EPISODE', @@ -467,41 +483,38 @@ class DiscoveryPlusIndiaIE(DPlayBaseIE): 'display_id': 'how-do-they-do-it/fugu-and-more', 'title': 'Fugu and More', 'description': 'The Japanese catch, prepare and eat the deadliest fish on the planet.', - 'duration': 1319, + 'duration': 1319.32, 'timestamp': 1582309800, 'upload_date': '20200221', 'series': 'How Do They Do It?', 'season_number': 8, 'episode_number': 2, 'creator': 'Discovery Channel', + 'thumbnail': r're:https://.+\.jpeg', + 'episode': 'Episode 2', + 'season': 'Season 8', + 'tags': [], }, 'params': { 'skip_download': True, } }] + _PRODUCT = 'dplus-india' + _DISCO_API_PARAMS = { + 'disco_host': 'ap2-prod-direct.discoveryplus.in', + 'realm': 'dplusindia', + 'country': 'in', + 'domain': 'https://www.discoveryplus.in/', + } + def _update_disco_api_headers(self, headers, disco_base, display_id, realm): headers.update({ 'x-disco-params': 'realm=%s' % realm, - 'x-disco-client': 'WEB:UNKNOWN:dplus-india:17.0.0', + 'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:17.0.0', 'Authorization': self._get_auth(disco_base, display_id, realm), }) - def _download_video_playback_info(self, disco_base, video_id, headers): - return self._download_json( - disco_base + 'playback/v3/videoPlaybackInfo', - video_id, headers=headers, data=json.dumps({ - 'deviceInfo': { - 'adBlocker': False, - }, - 'videoId': video_id, - }).encode('utf-8'))['data']['attributes']['streaming'] - - def _real_extract(self, url): - display_id = self._match_id(url) - return self._get_disco_api_info( - url, display_id, 'ap2-prod-direct.discoveryplus.in', 'dplusindia', 'in', 'https://www.discoveryplus.in/') - class DiscoveryNetworksDeIE(DPlayBaseIE): _VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:tlc|dmax)\.de|dplay\.co\.uk)/(?:programme|show|sendungen)/(?P<programme>[^/]+)/(?:video/)?(?P<alternate_id>[^/]+)' @@ -515,6 +528,16 @@ class DiscoveryNetworksDeIE(DPlayBaseIE): 'description': 'md5:61033c12b73286e409d99a41742ef608', 'timestamp': 1554069600, 'upload_date': '20190331', + 'creator': 'TLC', + 'season': 'Season 1', + 'series': 'Breaking Amish', + 'episode_number': 1, + 'tags': ['new york', 'großstadt', 'amische', 'landleben', 'modern', 'infos', 'tradition', 'herausforderung'], + 'display_id': 'breaking-amish/die-welt-da-drauen', + 'episode': 'Episode 1', + 'duration': 2625.024, + 'season_number': 1, + 'thumbnail': r're:https://.+\.jpg', }, 'params': { 'skip_download': True, @@ -575,19 +598,19 @@ class DiscoveryPlusShowBaseIE(DPlayBaseIE): return self.playlist_result(self._entries(show_name), playlist_id=show_name) -class DiscoveryPlusItalyIE(DiscoveryPlusIE): +class DiscoveryPlusItalyIE(DiscoveryPlusBaseIE): _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/it/video' + DPlayBaseIE._PATH_REGEX _TESTS = [{ 'url': 'https://www.discoveryplus.com/it/video/i-signori-della-neve/stagione-2-episodio-1-i-preparativi', 'only_matching': True, }] - _API_URL = 'eu1-prod-direct.discoveryplus.com' - - def _real_extract(self, url): - display_id = self._match_id(url) - return self._get_disco_api_info( - url, display_id, self._API_URL, 'dplay', 'it') + _PRODUCT = 'dplus_us' + _DISCO_API_PARAMS = { + 'disco_host': 'eu1-prod-direct.discoveryplus.com', + 'realm': 'dplay', + 'country': 'it', + } class DiscoveryPlusItalyShowIE(DiscoveryPlusShowBaseIE): |