X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Freverbnation.py;h=ec7e7df7bc1f7a6b8ffdb4fc46b24a9bf8cb5148;hb=89f691e14126d4e188c094a24c5cbcb693f26479;hp=c7784933674c2eeca06d9353b728d7e04f1d97ce;hpb=85a699246aa7554e2a88d5a93793dccb9a0b8d6d;p=youtube-dl diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dl/extractor/reverbnation.py index c77849336..ec7e7df7b 100644 --- a/youtube_dl/extractor/reverbnation.py +++ b/youtube_dl/extractor/reverbnation.py @@ -1,10 +1,9 @@ from __future__ import unicode_literals import re -import time from .common import InfoExtractor -from ..utils import strip_jsonp +from ..utils import str_or_none class ReverbNationIE(InfoExtractor): @@ -17,7 +16,7 @@ class ReverbNationIE(InfoExtractor): "ext": "mp3", "title": "MONA LISA", "uploader": "ALKILADOS", - "uploader_id": 216429, + "uploader_id": "216429", "thumbnail": "re:^https://gp1\.wac\.edgecastcdn\.net/.*?\.jpg$" }, }] @@ -27,10 +26,8 @@ class ReverbNationIE(InfoExtractor): song_id = mobj.group('id') api_res = self._download_json( - 'https://api.reverbnation.com/song/%s?callback=api_response_5&_=%d' - % (song_id, int(time.time() * 1000)), + 'https://api.reverbnation.com/song/%s' % song_id, song_id, - transform_source=strip_jsonp, note='Downloading information of song %s' % song_id ) @@ -39,7 +36,7 @@ class ReverbNationIE(InfoExtractor): 'title': api_res.get('name'), 'url': api_res.get('url'), 'uploader': api_res.get('artist', {}).get('name'), - 'uploader_id': api_res.get('artist', {}).get('id'), + 'uploader_id': str_or_none(api_res.get('artist', {}).get('id')), 'thumbnail': self._proto_relative_url( api_res.get('image', api_res.get('thumbnail'))), 'ext': 'mp3',