Upgrade yt_dlp and download script
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
import re
|
||||
import urllib.parse
|
||||
|
||||
from .turner import TurnerBaseIE
|
||||
from ..compat import (
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_parse_qs,
|
||||
)
|
||||
from ..utils import (
|
||||
float_or_none,
|
||||
int_or_none,
|
||||
@@ -27,7 +24,7 @@ class TBSIE(TurnerBaseIE):
|
||||
'params': {
|
||||
# m3u8 download
|
||||
'skip_download': True,
|
||||
}
|
||||
},
|
||||
}, {
|
||||
'url': 'http://www.tbs.com/shows/search-party/season-1/episode-1/explicit-the-mysterious-disappearance-of-the-girl-no-one-knew',
|
||||
'only_matching': True,
|
||||
@@ -42,20 +39,20 @@ class TBSIE(TurnerBaseIE):
|
||||
drupal_settings = self._parse_json(self._search_regex(
|
||||
r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
|
||||
webpage, 'drupal setting'), display_id)
|
||||
isLive = 'watchtnt' in path or 'watchtbs' in path
|
||||
video_data = next(v for v in drupal_settings['turner_playlist'] if isLive or v.get('url') == path)
|
||||
is_live = 'watchtnt' in path or 'watchtbs' in 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']
|
||||
title = video_data['title']
|
||||
tokenizer_query = compat_parse_qs(compat_urllib_parse_urlparse(
|
||||
tokenizer_query = urllib.parse.parse_qs(urllib.parse.urlparse(
|
||||
drupal_settings['ngtv_token_url']).query)
|
||||
|
||||
info = self._extract_ngtv_info(
|
||||
media_id, tokenizer_query, {
|
||||
'url': url,
|
||||
'site_name': site[:3].upper(),
|
||||
'auth_required': video_data.get('authRequired') == '1' or isLive,
|
||||
'is_live': isLive
|
||||
'auth_required': video_data.get('authRequired') == '1' or is_live,
|
||||
'is_live': is_live,
|
||||
})
|
||||
|
||||
thumbnails = []
|
||||
@@ -84,6 +81,6 @@ class TBSIE(TurnerBaseIE):
|
||||
'season_number': int_or_none(video_data.get('season')),
|
||||
'episode_number': int_or_none(video_data.get('episode')),
|
||||
'thumbnails': thumbnails,
|
||||
'is_live': isLive
|
||||
'is_live': is_live,
|
||||
})
|
||||
return info
|
||||
|
Reference in New Issue
Block a user