diff options
Diffstat (limited to 'youtube_dl/extractor/vlive.py')
| -rw-r--r-- | youtube_dl/extractor/vlive.py | 83 | 
1 files changed, 62 insertions, 21 deletions
diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py index baf39bb2c..8d671cca7 100644 --- a/youtube_dl/extractor/vlive.py +++ b/youtube_dl/extractor/vlive.py @@ -1,11 +1,15 @@  # coding: utf-8  from __future__ import unicode_literals +import re +  from .common import InfoExtractor  from ..utils import (      dict_get, +    ExtractorError,      float_or_none,      int_or_none, +    remove_start,  )  from ..compat import compat_urllib_parse_urlencode @@ -19,7 +23,7 @@ class VLiveIE(InfoExtractor):          'info_dict': {              'id': '1326',              'ext': 'mp4', -            'title': "[V] Girl's Day's Broadcast", +            'title': "[V LIVE] Girl's Day's Broadcast",              'creator': "Girl's Day",              'view_count': int,          }, @@ -31,16 +35,62 @@ class VLiveIE(InfoExtractor):          webpage = self._download_webpage(              'http://www.vlive.tv/video/%s' % video_id, video_id) -        long_video_id = self._search_regex( -            r'vlive\.tv\.video\.ajax\.request\.handler\.init\(\s*"[0-9]+"\s*,\s*"[^"]*"\s*,\s*"([^"]+)"', -            webpage, 'long video id') +        video_params = self._search_regex( +            r'\bvlive\.video\.init\(([^)]+)\)', +            webpage, 'video params') +        status, _, _, live_params, long_video_id, key = re.split( +            r'"\s*,\s*"', video_params)[2:8] +        status = remove_start(status, 'PRODUCT_') + +        if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR': +            live_params = self._parse_json('"%s"' % live_params, video_id) +            live_params = self._parse_json(live_params, video_id) +            return self._live(video_id, webpage, live_params) +        elif status == 'VOD_ON_AIR' or status == 'BIG_EVENT_INTRO': +            if long_video_id and key: +                return self._replay(video_id, webpage, long_video_id, key) +            else: +                status = 'COMING_SOON' -        key = self._search_regex( -            r'vlive\.tv\.video\.ajax\.request\.handler\.init\(\s*"[0-9]+"\s*,\s*"[^"]*"\s*,\s*"[^"]+"\s*,\s*"([^"]+)"', -            webpage, 'key') +        if status == 'LIVE_END': +            raise ExtractorError('Uploading for replay. Please wait...', +                                 expected=True) +        elif status == 'COMING_SOON': +            raise ExtractorError('Coming soon!', expected=True) +        elif status == 'CANCELED': +            raise ExtractorError('We are sorry, ' +                                 'but the live broadcast has been canceled.', +                                 expected=True) +        else: +            raise ExtractorError('Unknown status %s' % status) +    def _get_common_fields(self, webpage):          title = self._og_search_title(webpage) +        creator = self._html_search_regex( +            r'<div[^>]+class="info_area"[^>]*>\s*<a\s+[^>]*>([^<]+)', +            webpage, 'creator', fatal=False) +        thumbnail = self._og_search_thumbnail(webpage) +        return { +            'title': title, +            'creator': creator, +            'thumbnail': thumbnail, +        } + +    def _live(self, video_id, webpage, live_params): +        formats = [] +        for vid in live_params.get('resolutions', []): +            formats.extend(self._extract_m3u8_formats( +                vid['cdnUrl'], video_id, 'mp4', +                m3u8_id=vid.get('name'), +                fatal=False, live=True)) +        self._sort_formats(formats) + +        return dict(self._get_common_fields(webpage), +                    id=video_id, +                    formats=formats, +                    is_live=True) +    def _replay(self, video_id, webpage, long_video_id, key):          playinfo = self._download_json(              'http://global.apis.naver.com/rmcnmv/rmcnmv/vod_play_videoInfo.json?%s'              % compat_urllib_parse_urlencode({ @@ -62,11 +112,6 @@ class VLiveIE(InfoExtractor):          } for vid in playinfo.get('videos', {}).get('list', []) if vid.get('source')]          self._sort_formats(formats) -        thumbnail = self._og_search_thumbnail(webpage) -        creator = self._html_search_regex( -            r'<div[^>]+class="info_area"[^>]*>\s*<a\s+[^>]*>([^<]+)', -            webpage, 'creator', fatal=False) -          view_count = int_or_none(playinfo.get('meta', {}).get('count'))          subtitles = {} @@ -77,12 +122,8 @@ class VLiveIE(InfoExtractor):                      'ext': 'vtt',                      'url': caption['source']}] -        return { -            'id': video_id, -            'title': title, -            'creator': creator, -            'thumbnail': thumbnail, -            'view_count': view_count, -            'formats': formats, -            'subtitles': subtitles, -        } +        return dict(self._get_common_fields(webpage), +                    id=video_id, +                    formats=formats, +                    view_count=view_count, +                    subtitles=subtitles)  | 
