Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-31 01:12:51 +08:00
Code Issues Releases Wiki Activity

[vevo:playlist] Fix genre playlists

Browse Source
This commit is contained in:
Sergey M․ 2016-05-02 01:00:42 +06:00
parent 0c9d288ba0
commit e2bd301ce7
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/vevo.py
View File

@ -307,7 +307,7 @@ class VevoIE(InfoExtractor):
class VevoPlaylistIE(InfoExtractor): class VevoPlaylistIE(InfoExtractor):
_VALID_URL = r'https?://www\.vevo\.com/watch/(?: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',
@ -316,6 +316,13 @@ class VevoPlaylistIE(InfoExtractor):
'title': 'Best-Of: Birdman', 'title': 'Best-Of: Birdman',
}, },
'playlist_count': 10, 'playlist_count': 10,
}, {
'url': 'http://www.vevo.com/watch/genre/rock',
'info_dict': {
'id': 'rock',
'title': 'Rock',
},
'playlist_count': 20,
}, { }, {
'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29?index=0', 'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29?index=0',
'md5': '32dcdfddddf9ec6917fc88ca26d36282', 'md5': '32dcdfddddf9ec6917fc88ca26d36282',
@ -334,7 +341,9 @@ class VevoPlaylistIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) mobj = re.match(self._VALID_URL, url)
playlist_id = mobj.group('id')
playlist_kind = mobj.group('kind')
webpage = self._download_webpage(url, playlist_id) webpage = self._download_webpage(url, playlist_id)
@ -352,9 +361,10 @@ class VevoPlaylistIE(InfoExtractor):
self._search_regex( self._search_regex(
r'window\.__INITIAL_STORE__\s*=\s*({.+?});\s*</script>', r'window\.__INITIAL_STORE__\s*=\s*({.+?});\s*</script>',
webpage, 'initial store'), webpage, 'initial store'),
playlist_id)['default']['playlists'] playlist_id)['default']['%ss' % playlist_kind]
playlist = list(playlists.values())[0] 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' % src, VevoIE.ie_key())