projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #9747 from TRox1972/lynda
[youtube-dl]
/
youtube_dl
/
extractor
/
reverbnation.py
diff --git
a/youtube_dl/extractor/reverbnation.py
b/youtube_dl/extractor/reverbnation.py
index c7784933674c2eeca06d9353b728d7e04f1d97ce..3c6725aeb42945ce7f4e07b49bcd0d629248fcac 100644
(file)
--- a/
youtube_dl/extractor/reverbnation.py
+++ b/
youtube_dl/extractor/reverbnation.py
@@
-1,10
+1,9
@@
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
-import time
from .common import InfoExtractor
from .common import InfoExtractor
-from ..utils import str
ip_jsonp
+from ..utils import str
_or_none
class ReverbNationIE(InfoExtractor):
class ReverbNationIE(InfoExtractor):
@@
-13,12
+12,12
@@
class ReverbNationIE(InfoExtractor):
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
'md5': '3da12ebca28c67c111a7f8b262d3f7a7',
'info_dict': {
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
'md5': '3da12ebca28c67c111a7f8b262d3f7a7',
'info_dict': {
-
"id": "16965047"
,
-
"ext": "mp3"
,
-
"title": "MONA LISA"
,
-
"uploader": "ALKILADOS"
,
-
"uploader_id": 216429
,
- "thumbnail": "re:^https://gp1\.wac\.edgecastcdn\.net/.*?\.jpg$"
+
'id': '16965047'
,
+
'ext': 'mp3'
,
+
'title': 'MONA LISA'
,
+
'uploader': 'ALKILADOS'
,
+
'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(
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,
song_id,
- transform_source=strip_jsonp,
note='Downloading information of song %s' % song_id
)
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'),
'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',
'thumbnail': self._proto_relative_url(
api_res.get('image', api_res.get('thumbnail'))),
'ext': 'mp3',