diff options
| author | Filippo Valsorda <hi@filippo.io> | 2018-01-07 15:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 15:03:28 +0100 |
| commit | 97bc05116e15df3cf1b7b7216c60fad7ee0acc9f (patch) | |
| tree | 453059413184d22a44241d251a82196c5d2461eb /youtube_dl/extractor/vidio.py | |
| parent | 7608a91ee7b40c74a35c30b44731606382702592 (diff) | |
| parent | 0a5b1295b7c1aa6395b65ee137087c540b37b32b (diff) | |
| download | youtube-dl-totalwebcasting.tar.gz youtube-dl-totalwebcasting.tar.xz youtube-dl-totalwebcasting.zip | |
Merge branch 'master' into totalwebcasting totalwebcasting
Diffstat (limited to 'youtube_dl/extractor/vidio.py')
| -rw-r--r-- | youtube_dl/extractor/vidio.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/youtube_dl/extractor/vidio.py b/youtube_dl/extractor/vidio.py index 4e4b4e38c..01da32f1c 100644 --- a/youtube_dl/extractor/vidio.py +++ b/youtube_dl/extractor/vidio.py @@ -49,11 +49,15 @@ class VidioIE(InfoExtractor): thumbnail = clip.get('image') m3u8_url = m3u8_url or self._search_regex( - r'data(?:-vjs)?-clip-hls-url=(["\'])(?P<url>.+?)\1', webpage, 'hls url') - formats = self._extract_m3u8_formats(m3u8_url, display_id, 'mp4', entry_protocol='m3u8_native') + r'data(?:-vjs)?-clip-hls-url=(["\'])(?P<url>(?!\1).+)\1', + webpage, 'hls url') + formats = self._extract_m3u8_formats( + m3u8_url, display_id, 'mp4', entry_protocol='m3u8_native') + self._sort_formats(formats) duration = int_or_none(duration or self._search_regex( - r'data-video-duration=(["\'])(?P<duartion>\d+)\1', webpage, 'duration')) + r'data-video-duration=(["\'])(?P<duration>\d+)\1', webpage, + 'duration', fatal=False, group='duration')) thumbnail = thumbnail or self._og_search_thumbnail(webpage) like_count = int_or_none(self._search_regex( |