diff options
| author | CeruleanSky <CeruleanSky@users.noreply.github.com> | 2016-01-18 17:10:16 -0500 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-01-20 21:28:42 +0600 |
| commit | 1f78ed189aab9b7ea17594ac1f33662d37433455 (patch) | |
| tree | 7d6d4abbfee8f0c3e51389a308985b49d9316c46 /youtube_dl | |
| parent | 7dde358adcc3d6ef9e7a174cbeadde4d27029669 (diff) | |
[OraTV] update extractor
"current" is now "video"
"hls_stream" is now hls_stream without quotes
video_id is now id
duration for current video is not present(for other videos it is)
modified regex to find hls_stream variable to work reguardless of whether it is quoted or not.
[ora] Improve (Closes #8273)
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/ora.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/extractor/ora.py b/youtube_dl/extractor/ora.py index 02de1502a..8545fb1b8 100644 --- a/youtube_dl/extractor/ora.py +++ b/youtube_dl/extractor/ora.py @@ -21,7 +21,6 @@ class OraTVIE(InfoExtractor): 'ext': 'mp4', 'title': 'Vine & YouTube Stars Zach King & King Bach On Their Viral Videos!', 'description': 'md5:ebbc5b1424dd5dba7be7538148287ac1', - 'duration': 1477, } } @@ -30,9 +29,9 @@ class OraTVIE(InfoExtractor): webpage = self._download_webpage(url, display_id) video_data = self._search_regex( - r'"current"\s*:\s*({[^}]+?})', webpage, 'current video') + r'"(?:video|current)"\s*:\s*({[^}]+?})', webpage, 'current video') m3u8_url = self._search_regex( - r'"hls_stream"\s*:\s*"([^"]+)', video_data, 'm3u8 url', None) + r'hls_stream"?\s*:\s*"([^"]+)', video_data, 'm3u8 url', None) if m3u8_url: formats = self._extract_m3u8_formats( m3u8_url, display_id, 'mp4', 'm3u8_native', @@ -62,14 +61,12 @@ class OraTVIE(InfoExtractor): return { 'id': self._search_regex( - r'"video_id"\s*:\s*(\d+)', video_data, 'video id'), + r'"id"\s*:\s*(\d+)', video_data, 'video id', default=display_id), 'display_id': display_id, 'title': unescapeHTML(self._og_search_title(webpage)), 'description': get_element_by_attribute( 'class', 'video_txt_decription', webpage), 'thumbnail': self._proto_relative_url(self._search_regex( r'"thumb"\s*:\s*"([^"]+)', video_data, 'thumbnail', None)), - 'duration': int(self._search_regex( - r'"duration"\s*:\s*(\d+)', video_data, 'duration')), 'formats': formats, } |