R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add mp31, ogg and flac-format

Browse Source
This commit is contained in:
Thor77 2016-10-18 13:11:17 +02:00
parent 938163379d
commit a57de1577e
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
youtube_dl/extractor/jamendo.py
View File

@ -11,14 +11,14 @@ class JamendoIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?jamendo\.com/track/(?P<id>[0-9]+)/(?P<display_id>[\w-]+)' _VALID_URL = r'https?://(?:www\.)?jamendo\.com/track/(?P<id>[0-9]+)/(?P<display_id>[\w-]+)'
_TEST = { _TEST = {
'url': 'https://www.jamendo.com/track/196219/stories-from-emona-i', 'url': 'https://www.jamendo.com/track/196219/stories-from-emona-i',
'md5': '697564d8b10c60af35edda4fafb3fbfd', 'md5': '6e9e82ed6db98678f171c25a8ed09ffd',
'info_dict': { 'info_dict': {
'id': '196219', 'id': '196219',
'display_id': 'stories-from-emona-i', 'display_id': 'stories-from-emona-i',
'ext': 'mp3', 'ext': 'flac',
'title': 'Stories from Emona I', 'title': 'Stories from Emona I',
'thumbnail': 're:^https?://.*\.jpg', 'thumbnail': 're:^https?://.*\.jpg',
'url': 'https://mp3d.jamendo.com/download/track/196219/mp32' 'url': 'https://flac.jamendo.com/download/track/196219/flac/'
} }
} }
@ -30,14 +30,39 @@ class JamendoIE(InfoExtractor):
thumbnail = self._html_search_meta( thumbnail = self._html_search_meta(
'image', webpage, 'thumbnail', fatal=False) 'image', webpage, 'thumbnail', fatal=False)
title = self._html_search_meta('name', webpage, 'title') title = self._html_search_meta('name', webpage, 'title')
formats = [
{
'format_id': 'mp31',
'url': 'https://mp3l.jamendo.com/download/track/%s/mp31/'
% track_id,
'ext': 'mp3'
},
{
'format_id': 'mp32',
'url': 'https://mp3d.jamendo.com/download/track/%s/mp32/'
% track_id,
'ext': 'mp3'
},
{
'format_id': 'ogg',
'url': 'https://ogg.jamendo.com/download/track/%s/ogg1/'
% track_id,
'ext': 'ogg'
},
{
'format_id': 'flac',
'url': 'https://flac.jamendo.com/download/track/%s/flac/'
% track_id,
'ext': 'flac'
}
]
self._check_formats(formats, video_id=track_id)
return { return {
'id': track_id, 'id': track_id,
'display_id': url_data.group('display_id'), 'display_id': url_data.group('display_id'),
'ext': 'mp3',
'title': title,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'url': 'https://mp3d.jamendo.com/download/track/%s/mp32' % track_id 'title': title,
'formats': formats
} }