diff options
author | Sergey M․ <dstftw@gmail.com> | 2016-10-19 23:31:58 +0700 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2016-10-19 23:31:58 +0700 |
commit | 2b96b06bf0e235270cf4b6eb5fe2d8c910d33c42 (patch) | |
tree | c215fb4323deed4b4a0576d6015a591b0e7f8c55 /youtube_dl | |
parent | 06b3fe2926c62ad0a86da5ef8d2d7686755af000 (diff) |
[vidzi] Fix extraction (closes #10908, closes #10952)
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/extractor/vidzi.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dl/extractor/vidzi.py index d49cc6cbc..9950c62ad 100644 --- a/youtube_dl/extractor/vidzi.py +++ b/youtube_dl/extractor/vidzi.py @@ -1,10 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals +import re + from .jwplatform import JWPlatformBaseIE from ..utils import ( decode_packed_codes, js_to_json, + NO_DEFAULT, + PACKED_CODES_RE, ) @@ -35,10 +39,17 @@ class VidziIE(JWPlatformBaseIE): title = self._html_search_regex( r'(?s)<h2 class="video-title">(.*?)</h2>', webpage, 'title') - code = decode_packed_codes(webpage).replace('\\\'', '\'') - jwplayer_data = self._parse_json( - self._search_regex(r'setup\(([^)]+)\)', code, 'jwplayer data'), - video_id, transform_source=js_to_json) + packed_codes = [mobj.group(0) for mobj in re.finditer( + PACKED_CODES_RE, webpage)] + for num, pc in enumerate(packed_codes, 1): + code = decode_packed_codes(pc).replace('\\\'', '\'') + jwplayer_data = self._parse_json( + self._search_regex( + r'setup\(([^)]+)\)', code, 'jwplayer data', + default=NO_DEFAULT if num == len(packed_codes) else '{}'), + video_id, transform_source=js_to_json) + if jwplayer_data: + break info_dict = self._parse_jwplayer_data(jwplayer_data, video_id, require_title=False) info_dict['title'] = title |