R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vlive:playlist] Address PR comments

Browse Source
This commit is contained in:
Corey Nicholson 2017-07-09 18:20:51 +00:00
parent 7acd0b1117
commit 4dcd120606
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/extractors.py
View File

@ -1203,9 +1203,9 @@ from .vk import (
VKWallPostIE, VKWallPostIE,
) )
from .vlive import ( from .vlive import (
VLivePlaylistIE,
VLiveIE, VLiveIE,
VLiveChannelIE VLiveChannelIE,
VLivePlaylistIE
) )
from .vodlocker import VodlockerIE from .vodlocker import VodlockerIE
from .vodpl import VODPlIE from .vodpl import VODPlIE

24
youtube_dl/extractor/vlive.py
View File

@ -288,8 +288,20 @@ class VLivePlaylistIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) playlist_id = self._match_id(url)
video_id = self._search_regex( video_id_match = re.match(self._VALID_URL, url)
self._VALID_URL, url, 'video id', group='video_id') assert video_id_match
video_id = compat_str(video_id_match.group('video_id'))
video_url_format = '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_format % video_id,
ie=VLiveIE.ie_key(), video_id=video_id)
else:
self.to_screen(
'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), video_id)
@ -299,15 +311,15 @@ class VLivePlaylistIE(InfoExtractor):
webpage, 'playlist name', fatal=False) webpage, 'playlist name', fatal=False)
item_ids = self._search_regex( item_ids = self._search_regex(
r'\bvar\s+playlistVideoSeqs\s*=\s*\[([^\]]+)\]', r'\bvar\s+playlistVideoSeqs\s*=\s*\[([^]]+)\]',
webpage, 'playlist item ids', default='') webpage, 'playlist item ids')
entries = [] entries = []
for item_id in re.split(r'\s*,\s*', item_ids): for item_id in self._parse_json('[%s]' % item_ids, playlist_id):
item_id = compat_str(item_id) item_id = compat_str(item_id)
entries.append( entries.append(
self.url_result( self.url_result(
'http://www.vlive.tv/video/%s' % item_id, video_url_format % item_id,
ie=VLiveIE.ie_key(), video_id=item_id)) ie=VLiveIE.ie_key(), video_id=item_id))
return self.playlist_result( return self.playlist_result(