Skip to content

Commit

Permalink
vevo: fixing naming when there are featured artists
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew J. Erickson authored and dstftw committed Nov 24, 2016
1 parent 8eb7b5c commit 8b27d83
Showing 1 changed file with 27 additions and 4 deletions.
31 changes: 27 additions & 4 deletions youtube_dl/extractor/vevo.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,30 @@ class VevoIE(VevoBaseIE):
'info_dict': {
'id': 'USUV71503000',
'ext': 'mp4',
'title': 'K Camp - Till I Die',
'title': 'K Camp ft. T.I. - Till I Die',
'age_limit': 18,
'timestamp': 1449468000,
'upload_date': '20151207',
'uploader': 'K Camp',
'track': 'Till I Die',
'artist': 'K Camp',
'genre': 'Rap/Hip-Hop',
'genre': 'Hip-Hop',
},
}, {
'note': 'Featured test',
'url': 'https://www.vevo.com/watch/lemaitre/Wait/USUV71402190',
'md5': 'd28675e5e8805035d949dc5cf161071d',
'info_dict': {
'id': 'USUV71402190',
'ext': 'mp4',
'title': 'Lemaitre ft. LoLo - Wait',
'age_limit': 0,
'timestamp': 1413432000,
'upload_date': '20141016',
'uploader': 'Lemaitre',
'track': 'Wait',
'artist': 'Lemaitre',
'genre': 'Electronic',
},
}, {
'note': 'Only available via webpage',
Expand Down Expand Up @@ -242,8 +258,15 @@ def _real_extract(self, url):

timestamp = parse_iso8601(video_info.get('releaseDate'))
artists = video_info.get('artists')
if artists:
artist = uploader = artists[0]['name']
for curr_artist in artists:
if 'role' in curr_artist:
if curr_artist['role'] == 'Featured':
featured_artist = curr_artist['name']
elif curr_artist['role'] == 'Main':
artist = uploader = curr_artist['name']
else:
artist = uploader = curr_artist['name']
break
view_count = int_or_none(video_info.get('views', {}).get('total'))

for video_version in video_versions:
Expand Down

0 comments on commit 8b27d83

Please sign in to comment.