kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[vlive:playlist] Relax and simplify

Browse source
This commit is contained in:
Sergey M․ 2017-07-10 04:32:24 +07:00
parent b71c18b434
commit e3cd1fcdd1
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
youtube_dl/extractor/vlive.py
View file

@ -280,10 +280,8 @@ class VLivePlaylistIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) mobj = re.match(self._VALID_URL, url)
video_id_match = re.match(self._VALID_URL, url) video_id, playlist_id = mobj.group('video_id', 'id')
assert video_id_match
video_id = compat_str(video_id_match.group('video_id'))
VIDEO_URL_TEMPLATE = 'http://www.vlive.tv/video/%s' VIDEO_URL_TEMPLATE = 'http://www.vlive.tv/video/%s'
if self._downloader.params.get('noplaylist'): if self._downloader.params.get('noplaylist'):
@ -294,26 +292,27 @@ class VLivePlaylistIE(InfoExtractor):
ie=VLiveIE.ie_key(), video_id=video_id) ie=VLiveIE.ie_key(), video_id=video_id)
self.to_screen( self.to_screen(
'Downloading playlist %s - add --no-playlist to just download video' % playlist_id) 'Downloading playlist %s - add --no-playlist to just download video'
% playlist_id)
webpage = self._download_webpage( webpage = self._download_webpage(
'http://www.vlive.tv/video/%s/playlist/%s' % (video_id, playlist_id), video_id) 'http://www.vlive.tv/video/%s/playlist/%s'
% (video_id, playlist_id), playlist_id)
item_ids = self._parse_json(
self._search_regex(
r'playlistVideoSeqs\s*=\s*(\[[^]]+\])', webpage,
'playlist video seqs'),
playlist_id)
entries = [
self.url_result(
VIDEO_URL_TEMPLATE % item_id, ie=VLiveIE.ie_key(),
video_id=compat_str(item_id))
for item_id in item_ids]
playlist_name = self._html_search_regex( playlist_name = self._html_search_regex(
r'<div[^>]+class="[^"]*multicam_playlist[^>]*>\s*<h3[^>]+>([^<]+)', r'<div[^>]+class="[^"]*multicam_playlist[^>]*>\s*<h3[^>]+>([^<]+)',
webpage, 'playlist name', fatal=False) webpage, 'playlist title', fatal=False)
item_ids = self._search_regex( return self.playlist_result(entries, playlist_id, playlist_name)
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)