forked from Jamie-Landeg-Jones/youtube-dl
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fusion] fix extraction(closes #17775)(closes #21269)
- Loading branch information
1 parent
5526a4d
commit 4556858
Showing
1 changed file
with
59 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,84 @@ | ||
from __future__ import unicode_literals | ||
|
||
from .common import InfoExtractor | ||
from .ooyala import OoyalaIE | ||
from ..utils import ( | ||
determine_ext, | ||
int_or_none, | ||
mimetype2ext, | ||
parse_iso8601, | ||
) | ||
|
||
|
||
class FusionIE(InfoExtractor): | ||
_VALID_URL = r'https?://(?:www\.)?fusion\.(?:net|tv)/video/(?P<id>\d+)' | ||
_VALID_URL = r'https?://(?:www\.)?fusion\.(?:net|tv)/(?:video/|show/.+?\bvideo=)(?P<id>\d+)' | ||
_TESTS = [{ | ||
'url': 'http://fusion.tv/video/201781/u-s-and-panamanian-forces-work-together-to-stop-a-vessel-smuggling-drugs/', | ||
'info_dict': { | ||
'id': 'ZpcWNoMTE6x6uVIIWYpHh0qQDjxBuq5P', | ||
'id': '3145868', | ||
'ext': 'mp4', | ||
'title': 'U.S. and Panamanian forces work together to stop a vessel smuggling drugs', | ||
'description': 'md5:0cc84a9943c064c0f46b128b41b1b0d7', | ||
'duration': 140.0, | ||
'timestamp': 1442589635, | ||
'uploader': 'UNIVISON', | ||
'upload_date': '20150918', | ||
}, | ||
'params': { | ||
'skip_download': True, | ||
}, | ||
'add_ie': ['Ooyala'], | ||
'add_ie': ['Anvato'], | ||
}, { | ||
'url': 'http://fusion.tv/video/201781', | ||
'only_matching': True, | ||
}, { | ||
'url': 'https://fusion.tv/show/food-exposed-with-nelufar-hedayat/?ancla=full-episodes&video=588644', | ||
'only_matching': True, | ||
}] | ||
|
||
def _real_extract(self, url): | ||
display_id = self._match_id(url) | ||
webpage = self._download_webpage(url, display_id) | ||
video_id = self._match_id(url) | ||
video = self._download_json( | ||
'https://platform.fusion.net/wp-json/fusiondotnet/v1/video/' + video_id, video_id) | ||
|
||
info = { | ||
'id': video_id, | ||
'title': video['title'], | ||
'description': video.get('excerpt'), | ||
'timestamp': parse_iso8601(video.get('published')), | ||
'series': video.get('show'), | ||
} | ||
|
||
ooyala_code = self._search_regex( | ||
r'data-ooyala-id=(["\'])(?P<code>(?:(?!\1).)+)\1', | ||
webpage, 'ooyala code', group='code') | ||
formats = [] | ||
src = video.get('src') or {} | ||
for f_id, f in src.items(): | ||
for q_id, q in f.items(): | ||
q_url = q.get('url') | ||
if not q_url: | ||
continue | ||
ext = determine_ext(q_url, mimetype2ext(q.get('type'))) | ||
if ext == 'smil': | ||
formats.extend(self._extract_smil_formats(q_url, video_id, fatal=False)) | ||
elif f_id == 'm3u8-variant' or (ext == 'm3u8' and q_id == 'Variant'): | ||
formats.extend(self._extract_m3u8_formats( | ||
q_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) | ||
else: | ||
formats.append({ | ||
'format_id': '-'.join([f_id, q_id]), | ||
'url': q_url, | ||
'width': int_or_none(q.get('width')), | ||
'height': int_or_none(q.get('height')), | ||
'tbr': int_or_none(self._search_regex(r'_(\d+)\.m(?:p4|3u8)', q_url, 'bitrate')), | ||
'ext': 'mp4' if ext == 'm3u8' else ext, | ||
'protocol': 'm3u8_native' if ext == 'm3u8' else 'https', | ||
}) | ||
if formats: | ||
self._sort_formats(formats) | ||
info['formats'] = formats | ||
else: | ||
info.update({ | ||
'_type': 'url', | ||
'url': 'anvato:uni:' + video['video_ids']['anvato'], | ||
'ie_key': 'Anvato', | ||
}) | ||
|
||
return OoyalaIE._build_url_result(ooyala_code) | ||
return info |