projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mailru] Fix extraction (closes #24530) (#25239)
[youtube-dl]
/
youtube_dl
/
extractor
/
reverbnation.py
diff --git
a/youtube_dl/extractor/reverbnation.py
b/youtube_dl/extractor/reverbnation.py
index ec7e7df7bc1f7a6b8ffdb4fc46b24a9bf8cb5148..4cb99c244c34369902d085a60b068c5991d37ad8 100644
(file)
--- a/
youtube_dl/extractor/reverbnation.py
+++ b/
youtube_dl/extractor/reverbnation.py
@@
-1,29
+1,29
@@
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 (
+ qualities,
+ str_or_none,
+)
class ReverbNationIE(InfoExtractor):
_VALID_URL = r'^https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
_TESTS = [{
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
class ReverbNationIE(InfoExtractor):
_VALID_URL = r'^https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
_TESTS = [{
'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
- 'md5': '
3da12ebca28c67c111a7f8b262d3f7a7
',
+ 'md5': '
c0aaf339bcee189495fdf5a8c8ba8645
',
'info_dict': {
'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': r're:^https?://.*\.jpg',
},
}]
def _real_extract(self, url):
},
}]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- song_id = mobj.group('id')
+ song_id = self._match_id(url)
api_res = self._download_json(
'https://api.reverbnation.com/song/%s' % song_id,
api_res = self._download_json(
'https://api.reverbnation.com/song/%s' % song_id,
@@
-31,14
+31,23
@@
class ReverbNationIE(InfoExtractor):
note='Downloading information of song %s' % song_id
)
note='Downloading information of song %s' % song_id
)
+ THUMBNAILS = ('thumbnail', 'image')
+ quality = qualities(THUMBNAILS)
+ thumbnails = []
+ for thumb_key in THUMBNAILS:
+ if api_res.get(thumb_key):
+ thumbnails.append({
+ 'url': api_res[thumb_key],
+ 'preference': quality(thumb_key)
+ })
+
return {
'id': song_id,
return {
'id': song_id,
- 'title': api_res
.get('name')
,
- 'url': api_res
.get('url')
,
+ 'title': api_res
['name']
,
+ 'url': api_res
['url']
,
'uploader': api_res.get('artist', {}).get('name'),
'uploader_id': str_or_none(api_res.get('artist', {}).get('id')),
'uploader': api_res.get('artist', {}).get('name'),
'uploader_id': str_or_none(api_res.get('artist', {}).get('id')),
- 'thumbnail': self._proto_relative_url(
- api_res.get('image', api_res.get('thumbnail'))),
+ 'thumbnails': thumbnails,
'ext': 'mp3',
'vcodec': 'none',
}
'ext': 'mp3',
'vcodec': 'none',
}