[reverbnation] Modernize
This commit is contained in:
parent
1dd58e14d8
commit
3adb9d119e
|
@ -1,7 +1,5 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import str_or_none
|
from ..utils import str_or_none
|
||||||
|
|
||||||
|
@ -10,20 +8,19 @@ class ReverbNationIE(InfoExtractor):
|
||||||
_VALID_URL = r'^https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
|
_VALID_URL = r'^https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
|
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
|
||||||
'md5': '3da12ebca28c67c111a7f8b262d3f7a7',
|
'md5': 'c0aaf339bcee189495fdf5a8c8ba8645',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '16965047',
|
'id': '16965047',
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
'title': 'MONA LISA',
|
'title': 'MONA LISA',
|
||||||
'uploader': 'ALKILADOS',
|
'uploader': 'ALKILADOS',
|
||||||
'uploader_id': '216429',
|
'uploader_id': '216429',
|
||||||
'thumbnail': 're:^https://gp1\.wac\.edgecastcdn\.net/.*?\.jpg$'
|
'thumbnail': 're:^https?://.*\.jpg',
|
||||||
},
|
},
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
song_id = self._match_id(url)
|
||||||
song_id = mobj.group('id')
|
|
||||||
|
|
||||||
api_res = self._download_json(
|
api_res = self._download_json(
|
||||||
'https://api.reverbnation.com/song/%s' % song_id,
|
'https://api.reverbnation.com/song/%s' % song_id,
|
||||||
|
@ -31,14 +28,24 @@ class ReverbNationIE(InfoExtractor):
|
||||||
note='Downloading information of song %s' % song_id
|
note='Downloading information of song %s' % song_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
thumbnails = []
|
||||||
|
if api_res.get('image'):
|
||||||
|
thumbnails.append({
|
||||||
|
'url': api_res.get('image'),
|
||||||
|
})
|
||||||
|
if api_res.get('thumbnail'):
|
||||||
|
thumbnails.append({
|
||||||
|
'url': api_res.get('thumbnail'),
|
||||||
|
'preference': -2,
|
||||||
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': song_id,
|
'id': song_id,
|
||||||
'title': api_res.get('name'),
|
'title': api_res['name'],
|
||||||
'url': api_res.get('url'),
|
'url': api_res['url'],
|
||||||
'uploader': api_res.get('artist', {}).get('name'),
|
'uploader': api_res.get('artist', {}).get('name'),
|
||||||
'uploader_id': str_or_none(api_res.get('artist', {}).get('id')),
|
'uploader_id': str_or_none(api_res.get('artist', {}).get('id')),
|
||||||
'thumbnail': self._proto_relative_url(
|
'thumbnails': thumbnails,
|
||||||
api_res.get('image', api_res.get('thumbnail'))),
|
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
'vcodec': 'none',
|
'vcodec': 'none',
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue