fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[deezer] Add support for geoblocking

This commit is contained in:
Philipp Hagemeister 2014-09-13 08:51:21 +02:00
parent 4eefbfdbfd
commit 6539c91a78
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/deezer.py
View File

@ -5,6 +5,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError,
int_or_none, int_or_none,
orderedSet, orderedSet,
) )
@ -21,6 +22,7 @@ class DeezerPlaylistIE(InfoExtractor):
'thumbnail': 're:^https?://cdn-images.deezer.com/images/cover/.*\.jpg$', 'thumbnail': 're:^https?://cdn-images.deezer.com/images/cover/.*\.jpg$',
}, },
'playlist_count': 30, 'playlist_count': 30,
'skip': 'Only available in .de',
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -31,6 +33,13 @@ class DeezerPlaylistIE(InfoExtractor):
playlist_id = mobj.group('id') playlist_id = mobj.group('id')
webpage = self._download_webpage(url, playlist_id) webpage = self._download_webpage(url, playlist_id)
geoblocking_msg = self._html_search_regex(
r'<p class="soon-txt">(.*?)</p>', webpage, 'geoblocking message',
default=None)
if geoblocking_msg is not None:
raise ExtractorError(
'Deezer said: %s' % geoblocking_msg, expected=True)
data_json = self._search_regex( data_json = self._search_regex(
r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n', webpage, 'data JSON') r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n', webpage, 'data JSON')
data = json.loads(data_json) data = json.loads(data_json)