aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSipherdrakon <64430430+Sipherdrakon@users.noreply.github.com>2021-07-29 00:25:00 -0400
committerGitHub <noreply@github.com>2021-07-29 09:55:00 +0530
commit45d1f1572510b4b4cf8c97f204871838c1730996 (patch)
tree427b53adf0a06669e2493020bbe3fb0cbf9bf41c
parenta318f59d14792d25b2206c3f50181e03e8716db7 (diff)
downloadhypervideo-pre-45d1f1572510b4b4cf8c97f204871838c1730996.tar.lz
hypervideo-pre-45d1f1572510b4b4cf8c97f204871838c1730996.tar.xz
hypervideo-pre-45d1f1572510b4b4cf8c97f204871838c1730996.zip
[dplay] Add `ScienceChannelIE` (#567)
Authored by: Sipherdrakon
-rw-r--r--yt_dlp/extractor/discoveryplusindia.py3
-rw-r--r--yt_dlp/extractor/dplay.py71
-rw-r--r--yt_dlp/extractor/extractors.py1
3 files changed, 49 insertions, 26 deletions
diff --git a/yt_dlp/extractor/discoveryplusindia.py b/yt_dlp/extractor/discoveryplusindia.py
index ee57bb2d0..4f2f4f731 100644
--- a/yt_dlp/extractor/discoveryplusindia.py
+++ b/yt_dlp/extractor/discoveryplusindia.py
@@ -63,8 +63,7 @@ class DiscoveryPlusIndiaShowIE(InfoExtractor):
'info_dict': {
'id': 'how-do-they-do-it',
},
- }
- ]
+ }]
def _entries(self, show_name):
headers = {
diff --git a/yt_dlp/extractor/dplay.py b/yt_dlp/extractor/dplay.py
index bbb199094..38b08d280 100644
--- a/yt_dlp/extractor/dplay.py
+++ b/yt_dlp/extractor/dplay.py
@@ -296,6 +296,35 @@ class DPlayIE(InfoExtractor):
url, display_id, host, 'dplay' + country, country)
+class HGTVDeIE(DPlayIE):
+ _VALID_URL = r'https?://de\.hgtv\.com/sendungen' + DPlayIE._PATH_REGEX
+ _TESTS = [{
+ 'url': 'https://de.hgtv.com/sendungen/tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette/',
+ 'info_dict': {
+ 'id': '151205',
+ 'display_id': 'tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette',
+ 'ext': 'mp4',
+ 'title': 'Wer braucht schon eine Toilette',
+ 'description': 'md5:05b40a27e7aed2c9172de34d459134e2',
+ 'duration': 1177.024,
+ 'timestamp': 1595705400,
+ 'upload_date': '20200725',
+ 'creator': 'HGTV',
+ 'series': 'Tiny House - klein, aber oho',
+ 'season_number': 3,
+ 'episode_number': 3,
+ },
+ 'params': {
+ 'format': 'bestvideo',
+ },
+ }]
+
+ def _real_extract(self, url):
+ display_id = self._match_id(url)
+ return self._get_disco_api_info(
+ url, display_id, 'eu1-prod.disco-api.com', 'hgtv', 'de')
+
+
class DiscoveryPlusIE(DPlayIE):
_VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/video' + DPlayIE._PATH_REGEX
_TESTS = [{
@@ -317,8 +346,11 @@ class DiscoveryPlusIE(DPlayIE):
'skip': 'Available for Premium users',
}]
+ _PRODUCT = 'dplus_us'
+ _API_URL = 'us1-prod-direct.discoveryplus.com'
+
def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
- headers['x-disco-client'] = 'WEB:UNKNOWN:dplus_us:15.0.0'
+ headers['x-disco-client'] = f'WEB:UNKNOWN:{self._PRODUCT}:15.0.0'
def _download_video_playback_info(self, disco_base, video_id, headers):
return self._download_json(
@@ -330,40 +362,31 @@ class DiscoveryPlusIE(DPlayIE):
'videoId': video_id,
'wisteriaProperties': {
'platform': 'desktop',
- 'product': 'dplus_us',
+ 'product': self._PRODUCT,
},
}).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, 'us1-prod-direct.discoveryplus.com', 'go', 'us')
+ url, display_id, self._API_URL, 'go', 'us')
-class HGTVDeIE(DPlayIE):
- _VALID_URL = r'https?://de\.hgtv\.com/sendungen' + DPlayIE._PATH_REGEX
+class ScienceChannelIE(DiscoveryPlusIE):
+ _VALID_URL = r'https?://(?:www\.)?sciencechannel\.com/video' + DPlayIE._PATH_REGEX
_TESTS = [{
- 'url': 'https://de.hgtv.com/sendungen/tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette/',
+ 'url': 'https://www.sciencechannel.com/video/strangest-things-science-atve-us/nazi-mystery-machine',
'info_dict': {
- 'id': '151205',
- 'display_id': 'tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette',
+ 'id': '2842849',
+ 'display_id': 'strangest-things-science-atve-us/nazi-mystery-machine',
'ext': 'mp4',
- 'title': 'Wer braucht schon eine Toilette',
- 'description': 'md5:05b40a27e7aed2c9172de34d459134e2',
- 'duration': 1177.024,
- 'timestamp': 1595705400,
- 'upload_date': '20200725',
- 'creator': 'HGTV',
- 'series': 'Tiny House - klein, aber oho',
- 'season_number': 3,
- 'episode_number': 3,
- },
- 'params': {
- 'format': 'bestvideo',
+ 'title': 'Nazi Mystery Machine',
+ 'description': 'Experts investigate the secrets of a revolutionary encryption machine.',
+ 'season_number': 1,
+ 'episode_number': 1,
},
+ 'skip': 'Available for Premium users',
}]
- def _real_extract(self, url):
- display_id = self._match_id(url)
- return self._get_disco_api_info(
- url, display_id, 'eu1-prod.disco-api.com', 'hgtv', 'de')
+ _PRODUCT = 'sci'
+ _API_URL = 'us1-prod-direct.sciencechannel.com'
diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py
index 991c36014..c0c613e14 100644
--- a/yt_dlp/extractor/extractors.py
+++ b/yt_dlp/extractor/extractors.py
@@ -330,6 +330,7 @@ from .dplay import (
DPlayIE,
DiscoveryPlusIE,
HGTVDeIE,
+ ScienceChannelIE
)
from .dreisat import DreiSatIE
from .drbonanza import DRBonanzaIE