mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-01 20:16:38 +02:00
[tubitv] fix extraction(closes #11061)
This commit is contained in:
parent
3b4b66b50c
commit
f4dfa9a5ed
@ -9,7 +9,6 @@
|
|||||||
int_or_none,
|
int_or_none,
|
||||||
sanitized_Request,
|
sanitized_Request,
|
||||||
urlencode_postdata,
|
urlencode_postdata,
|
||||||
parse_iso8601,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -19,17 +18,13 @@ class TubiTvIE(InfoExtractor):
|
|||||||
_NETRC_MACHINE = 'tubitv'
|
_NETRC_MACHINE = 'tubitv'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://tubitv.com/video/283829/the_comedian_at_the_friday',
|
'url': 'http://tubitv.com/video/283829/the_comedian_at_the_friday',
|
||||||
|
'md5': '43ac06be9326f41912dc64ccf7a80320',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '283829',
|
'id': '283829',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'The Comedian at The Friday',
|
'title': 'The Comedian at The Friday',
|
||||||
'description': 'A stand up comedian is forced to look at the decisions in his life while on a one week trip to the west coast.',
|
'description': 'A stand up comedian is forced to look at the decisions in his life while on a one week trip to the west coast.',
|
||||||
'uploader': 'Indie Rights Films',
|
'uploader_id': 'bc168bee0d18dd1cb3b86c68706ab434',
|
||||||
'upload_date': '20160111',
|
|
||||||
'timestamp': 1452555979,
|
|
||||||
},
|
|
||||||
'params': {
|
|
||||||
'skip_download': 'HLS download',
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,19 +53,28 @@ def _real_extract(self, url):
|
|||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
video_data = self._download_json(
|
video_data = self._download_json(
|
||||||
'http://tubitv.com/oz/videos/%s/content' % video_id, video_id)
|
'http://tubitv.com/oz/videos/%s/content' % video_id, video_id)
|
||||||
title = video_data['n']
|
title = video_data['title']
|
||||||
|
|
||||||
formats = self._extract_m3u8_formats(
|
formats = self._extract_m3u8_formats(
|
||||||
video_data['mh'], video_id, 'mp4', 'm3u8_native')
|
self._proto_relative_url(video_data['url']),
|
||||||
|
video_id, 'mp4', 'm3u8_native')
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
thumbnails = []
|
||||||
|
for thumbnail_url in video_data.get('thumbnails', []):
|
||||||
|
if not thumbnail_url:
|
||||||
|
continue
|
||||||
|
thumbnails.append({
|
||||||
|
'url': self._proto_relative_url(thumbnail_url),
|
||||||
|
})
|
||||||
|
|
||||||
subtitles = {}
|
subtitles = {}
|
||||||
for sub in video_data.get('sb', []):
|
for sub in video_data.get('subtitles', []):
|
||||||
sub_url = sub.get('u')
|
sub_url = sub.get('url')
|
||||||
if not sub_url:
|
if not sub_url:
|
||||||
continue
|
continue
|
||||||
subtitles.setdefault(sub.get('l', 'en'), []).append({
|
subtitles.setdefault(sub.get('lang', 'English'), []).append({
|
||||||
'url': sub_url,
|
'url': self._proto_relative_url(sub_url),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -78,9 +82,8 @@ def _real_extract(self, url):
|
|||||||
'title': title,
|
'title': title,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'subtitles': subtitles,
|
'subtitles': subtitles,
|
||||||
'thumbnail': video_data.get('ph'),
|
'thumbnails': thumbnails,
|
||||||
'description': video_data.get('d'),
|
'description': video_data.get('description'),
|
||||||
'duration': int_or_none(video_data.get('s')),
|
'duration': int_or_none(video_data.get('duration')),
|
||||||
'timestamp': parse_iso8601(video_data.get('u')),
|
'uploader_id': video_data.get('publisher_id'),
|
||||||
'uploader': video_data.get('on'),
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user