lopar/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-02-15 14:39:52 +00:00
Code Releases Activity

fixed playlist download issues #13395 and #13394

Browse Source
This commit is contained in:
Argn0 2017-06-22 12:51:19 +02:00 committed by GitHub
parent 91e59e05a0
commit b21b1e7e50
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
youtube_dl/extractor/vevo.py
View File

@ -186,7 +186,6 @@ class VevoIE(VevoBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
self._initialize_api(video_id) self._initialize_api(video_id)
video_info = self._call_api( video_info = self._call_api(
@ -304,7 +303,6 @@ class VevoIE(VevoBaseIE):
class VevoPlaylistIE(VevoBaseIE): class VevoPlaylistIE(VevoBaseIE):
_VALID_URL = r'https?://(?:www\.)?vevo\.com/watch/(?P<kind>playlist|genre)/(?P<id>[^/?#&]+)' _VALID_URL = r'https?://(?:www\.)?vevo\.com/watch/(?P<kind>playlist|genre)/(?P<id>[^/?#&]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29', 'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29',
'info_dict': { 'info_dict': {
@ -342,29 +340,17 @@ class VevoPlaylistIE(VevoBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
playlist_id = mobj.group('id') playlist_id = mobj.group('id')
playlist_kind = mobj.group('kind')
webpage = self._download_webpage(url, playlist_id) webpage = self._download_webpage(url, playlist_id)
qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query) qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
index = qs.get('index', [None])[0] index = qs.get('index', [None])[0]
playlist_videoIDs = re.findall(r',"isrc":"(.*?)","title', webpage)
if index: if index:
video_id = self._search_regex( return self.url_result('vevo:%s' % playlist_videoIDs[int(index)], VevoIE.ie_key())
r'<meta[^>]+content=(["\'])vevo://video/(?P<id>.+?)\1[^>]*>',
webpage, 'video id', default=None, group='id')
if video_id:
return self.url_result('vevo:%s' % video_id, VevoIE.ie_key())
playlists = self._extract_json(webpage, playlist_id)['default']['%ss' % playlist_kind]
playlist = (list(playlists.values())[0]
if playlist_kind == 'playlist' else playlists[playlist_id])
entries = [ entries = [
self.url_result('vevo:%s' % src, VevoIE.ie_key()) self.url_result('vevo:%s' % videoID, VevoIE.ie_key())
for src in playlist['isrcs']] for videoID in playlist_videoIDs]
return self.playlist_result( return self.playlist_result(entries, playlist_id)
entries, playlist.get('playlistId') or playlist_id,
playlist.get('name'), playlist.get('description'))