ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-14 09:16:32 +00:00
Code Issues Projects Releases Wiki Activity

[vevo] Improve genre extraction

Browse Source
This commit is contained in:
Sergey M․ 2016-05-02 18:19:00 +06:00
parent 686cc89634
commit 5c9ced9504
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/vevo.py
View File

@ -5,6 +5,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
compat_etree_fromstring, compat_etree_fromstring,
compat_str,
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
@ -116,6 +117,10 @@ class VevoIE(VevoBaseIE):
'genre': 'Pop', 'genre': 'Pop',
}, },
'expected_warnings': ['Failed to download video versions info'], 'expected_warnings': ['Failed to download video versions info'],
}, {
# no genres available
'url': 'http://www.vevo.com/watch/INS171400764',
'only_matching': True,
}] }]
_SMIL_BASE_URL = 'http://smil.lvl3.vevo.com' _SMIL_BASE_URL = 'http://smil.lvl3.vevo.com'
_SOURCE_TYPES = { _SOURCE_TYPES = {
@ -339,7 +344,11 @@ class VevoIE(VevoBaseIE):
if featured_artist: if featured_artist:
artist = '%s ft. %s' % (artist, featured_artist) artist = '%s ft. %s' % (artist, featured_artist)
title = '%s - %s' % (artist, track) if artist else track title = '%s - %s' % (artist, track) if artist else track
genre = video_info.get('genres', [None])[0]
genres = video_info.get('genres')
genre = (
genres[0] if genres and isinstance(genres, list) and
isinstance(genres[0], compat_str) else None)
is_explicit = video_info.get('isExplicit') is_explicit = video_info.get('isExplicit')
if is_explicit is True: if is_explicit is True: