Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[beatenpro] Improve display_id

pull/5199/head
Sergey M․ 2015-03-13 22:03:58 +06:00
parent 517bcca299
commit ba1d4c0488
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/beatportpro.py
View File

@ -9,7 +9,7 @@ from ..utils import int_or_none
class BeatportProIE(InfoExtractor): class BeatportProIE(InfoExtractor):
_VALID_URL = r'https?://pro\.beatport\.com/track/.+/(?P<id>[0-9]+)' _VALID_URL = r'https?://pro\.beatport\.com/track/(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://pro.beatport.com/track/synesthesia-original-mix/5379371', 'url': 'https://pro.beatport.com/track/synesthesia-original-mix/5379371',
'md5': 'b3c34d8639a2f6a7f734382358478887', 'md5': 'b3c34d8639a2f6a7f734382358478887',
@ -40,8 +40,11 @@ class BeatportProIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
track_id = self._match_id(url) mobj = re.match(self._VALID_URL, url)
webpage = self._download_webpage(url, track_id) track_id = mobj.group('id')
display_id = mobj.group('display_id')
webpage = self._download_webpage(url, display_id)
playables = self._search_regex( playables = self._search_regex(
r'window\.Playables\s*=\s*({.*?});', webpage, r'window\.Playables\s*=\s*({.*?});', webpage,
@ -92,7 +95,7 @@ class BeatportProIE(InfoExtractor):
return { return {
'id': track['id'], 'id': track['id'],
'display-id': track['slug'], 'display_id': track.get('slug') or display_id,
'title': title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnails': images, 'thumbnails': images,