diff --git a/youtube_dl/extractor/deezer.py b/youtube_dl/extractor/deezer.py index 2dfa2e54a..d783d29c2 100644 --- a/youtube_dl/extractor/deezer.py +++ b/youtube_dl/extractor/deezer.py @@ -152,152 +152,3 @@ class DeezerPlaylistIE(InfoExtractor): #'thumbnail': playlist_thumbnail, 'entries': entries, } - - if song["FILESIZE_MP3_256"]: - return 5 - return 1 - - - -############ - -class DeezerPlaylistIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?deezer\.com/\w+/(?P[0-9]+)' - _TEST = { - 'url': 'http://www.deezer.com/playlist/176747451', - 'info_dict': { - 'id': '176747451', - 'title': 'Best!', - 'uploader': 'Anonymous', - 'thumbnail': r're:^https?://cdn-images.deezer.com/images/cover/.*\.jpg$', - }, - 'playlist_count': 30, - 'skip': 'Only available in .de', - } - - def _real_extract(self, url): - if 'test' not in self._downloader.params: - self._downloader.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!') - - mobj = re.match(self._VALID_URL, url) - playlist_id = mobj.group('id') - - webpage = self._download_webpage(url, playlist_id) - geoblocking_msg = self._html_search_regex( - r'

(.*?)

', webpage, 'geoblocking message', - default=None) - if geoblocking_msg is not None: - raise ExtractorError( - 'Deezer said: %s' % geoblocking_msg, expected=True) - - host_stream_cdn = self._search_regex( - r'var HOST_STREAM_CDN = \'(.*?)\'', webpage, 'host stream cdn') - setting_domain_img = self._search_regex( - r'var SETTING_DOMAIN_IMG = \'(.*?)\'', webpage, 'setting domain img') - - data_json = self._search_regex( - (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*', - r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'), - webpage, 'data JSON') - data = json.loads(data_json) - - playlist_title = data.get('DATA', {}).get('TITLE') - playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME') - #playlist_thumbnail = self._search_regex( r'