aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoreynicholson <coreynicholson@users.noreply.github.com>2017-07-09 22:24:04 +0100
committerSergey M <dstftw@gmail.com>2017-07-10 04:24:04 +0700
commitb71c18b4343d54ce8373e9a11df882aca1ae82a0 (patch)
treef0a06c9a3384aa4e5a87c719cb5a55332c21a635
parent7bf539edcc3dc44481d5196fd01637698653ffc7 (diff)
[vlive:playlist] Add extractor
-rw-r--r--youtube_dl/extractor/extractors.py3
-rw-r--r--youtube_dl/extractor/vlive.py56
2 files changed, 58 insertions, 1 deletions
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 9ee080895..eb1541729 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1206,7 +1206,8 @@ from .vk import (
)
from .vlive import (
VLiveIE,
- VLiveChannelIE
+ VLiveChannelIE,
+ VLivePlaylistIE
)
from .vodlocker import VodlockerIE
from .vodpl import VODPlIE
diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py
index e58940607..f3825db5c 100644
--- a/youtube_dl/extractor/vlive.py
+++ b/youtube_dl/extractor/vlive.py
@@ -49,6 +49,10 @@ class VLiveIE(InfoExtractor):
},
}]
+ @classmethod
+ def suitable(cls, url):
+ return False if VLivePlaylistIE.suitable(url) else super(VLiveIE, cls).suitable(url)
+
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -261,3 +265,55 @@ class VLiveChannelIE(InfoExtractor):
return self.playlist_result(
entries, channel_code, channel_name)
+
+
+class VLivePlaylistIE(InfoExtractor):
+ IE_NAME = 'vlive:playlist'
+ _VALID_URL = r'https?://(?:(?:www|m)\.)?vlive\.tv/video/(?P<video_id>[0-9]+)/playlist/(?P<id>[0-9]+)'
+ _TEST = {
+ 'url': 'http://www.vlive.tv/video/22867/playlist/22912',
+ 'info_dict': {
+ 'id': '22912',
+ 'title': 'Valentine Day Message from TWICE'
+ },
+ 'playlist_mincount': 9
+ }
+
+ def _real_extract(self, url):
+ playlist_id = self._match_id(url)
+ video_id_match = re.match(self._VALID_URL, url)
+ assert video_id_match
+ video_id = compat_str(video_id_match.group('video_id'))
+
+ VIDEO_URL_TEMPLATE = 'http://www.vlive.tv/video/%s'
+ if self._downloader.params.get('noplaylist'):
+ self.to_screen(
+ 'Downloading just video %s because of --no-playlist' % video_id)
+ return self.url_result(
+ VIDEO_URL_TEMPLATE % video_id,
+ ie=VLiveIE.ie_key(), video_id=video_id)
+
+ self.to_screen(
+ 'Downloading playlist %s - add --no-playlist to just download video' % playlist_id)
+
+ webpage = self._download_webpage(
+ 'http://www.vlive.tv/video/%s/playlist/%s' % (video_id, playlist_id), video_id)
+
+ playlist_name = self._html_search_regex(
+ r'<div[^>]+class="[^"]*multicam_playlist[^>]*>\s*<h3[^>]+>([^<]+)',
+ webpage, 'playlist name', fatal=False)
+
+ item_ids = self._search_regex(
+ r'\bvar\s+playlistVideoSeqs\s*=\s*(\[[^]]+\])',
+ webpage, 'playlist item ids')
+
+ entries = []
+ for item_id in self._parse_json(item_ids, playlist_id):
+ item_id = compat_str(item_id)
+ entries.append(
+ self.url_result(
+ VIDEO_URL_TEMPLATE % item_id,
+ ie=VLiveIE.ie_key(), video_id=item_id))
+
+ return self.playlist_result(
+ entries, playlist_id, playlist_name)