mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-30 07:28:19 +01:00
Merge 3d60559deb
into 4b5eec0aaa
This commit is contained in:
commit
4edb2fb2ad
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
class TBSIE(TurnerBaseIE):
|
class TBSIE(TurnerBaseIE):
|
||||||
_VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama)\.com(?P<path>/(?:movies|watchtnt|watchtbs|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+))'
|
_VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama|trutv)\.com(?P<path>/(?:movies|watchtnt|watchtbs|watchtrutv|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+))'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.tntdrama.com/shows/the-alienist/clips/monster',
|
'url': 'http://www.tntdrama.com/shows/the-alienist/clips/monster',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
@ -31,6 +31,12 @@ class TBSIE(TurnerBaseIE):
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.tntdrama.com/movies/star-wars-a-new-hope',
|
'url': 'http://www.tntdrama.com/movies/star-wars-a-new-hope',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.trutv.com/shows/impractical-jokers/season-9/episode-1/you-dirty-dog',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.trutv.com/watchtrutv/east',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
@ -39,7 +45,7 @@ def _real_extract(self, url):
|
||||||
drupal_settings = self._parse_json(self._search_regex(
|
drupal_settings = self._parse_json(self._search_regex(
|
||||||
r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
|
r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
|
||||||
webpage, 'drupal setting'), display_id)
|
webpage, 'drupal setting'), display_id)
|
||||||
is_live = 'watchtnt' in path or 'watchtbs' in path
|
is_live = 'watchtnt' in path or 'watchtbs' in path or 'watchtrutv' in path
|
||||||
video_data = next(v for v in drupal_settings['turner_playlist'] if is_live or v.get('url') == path)
|
video_data = next(v for v in drupal_settings['turner_playlist'] if is_live or v.get('url') == path)
|
||||||
|
|
||||||
media_id = video_data['mediaID']
|
media_id = video_data['mediaID']
|
||||||
|
@ -50,7 +56,7 @@ def _real_extract(self, url):
|
||||||
info = self._extract_ngtv_info(
|
info = self._extract_ngtv_info(
|
||||||
media_id, tokenizer_query, {
|
media_id, tokenizer_query, {
|
||||||
'url': url,
|
'url': url,
|
||||||
'site_name': site[:3].upper(),
|
'site_name': {'tbs': 'TBS', 'tnt': 'TNT', 'trutv': 'truTV'}[site],
|
||||||
'auth_required': video_data.get('authRequired') == '1' or is_live,
|
'auth_required': video_data.get('authRequired') == '1' or is_live,
|
||||||
'is_live': is_live,
|
'is_live': is_live,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user