diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-08-24 00:36:54 +0600 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-08-24 00:36:54 +0600 | 
| commit | e4df2f98ccbe2e24785dd6883d7fd495193fd8e6 (patch) | |
| tree | 1b9980809953da4911a256715e40a018be666808 | |
| parent | e7c14660d3aef3a5a303a82dee7e11dfe063048d (diff) | |
[yandexmusic:track] Eliminate base class
| -rw-r--r-- | youtube_dl/extractor/yandexmusic.py | 36 | 
1 files changed, 17 insertions, 19 deletions
diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py index 85c495c11..91829be1c 100644 --- a/youtube_dl/extractor/yandexmusic.py +++ b/youtube_dl/extractor/yandexmusic.py @@ -12,7 +12,23 @@ from ..utils import (  ) -class YandexMusicBaseIE(InfoExtractor): +class YandexMusicTrackIE(InfoExtractor): +    IE_NAME = 'yandexmusic:track' +    IE_DESC = 'Яндекс.Музыка - Трек' +    _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<album_id>\d+)/track/(?P<id>\d+)' + +    _TEST = { +        'url': 'http://music.yandex.ru/album/540508/track/4878838', +        'md5': 'f496818aa2f60b6c0062980d2e00dc20', +        'info_dict': { +            'id': '4878838', +            'ext': 'mp3', +            'title': 'Carlo Ambrosio - Gypsy Eyes 1', +            'filesize': 4628061, +            'duration': 193.04, +        } +    } +      def _get_track_url(self, storage_dir, track_id):          data = self._download_json(              'http://music.yandex.ru/api/v1.5/handlers/api-jsonp.jsx?action=getTrackSrc&p=download-info/%s' @@ -35,24 +51,6 @@ class YandexMusicBaseIE(InfoExtractor):              'duration': float_or_none(track.get('durationMs'), 1000),          } - -class YandexMusicTrackIE(YandexMusicBaseIE): -    IE_NAME = 'yandexmusic:track' -    IE_DESC = 'Яндекс.Музыка - Трек' -    _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<album_id>\d+)/track/(?P<id>\d+)' - -    _TEST = { -        'url': 'http://music.yandex.ru/album/540508/track/4878838', -        'md5': 'f496818aa2f60b6c0062980d2e00dc20', -        'info_dict': { -            'id': '4878838', -            'ext': 'mp3', -            'title': 'Carlo Ambrosio - Gypsy Eyes 1', -            'filesize': 4628061, -            'duration': 193.04, -        } -    } -      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url)          album_id, track_id = mobj.group('album_id'), mobj.group('id')  | 
