commit ac943d48d3b1041afd884543235c9fdf41c71aaa
parent 73498a89216f3b83da7265eecfe616c17e54aba9
Author: Déstin Reed <archcr8@gmail.com>
Date: Sat, 15 Oct 2016 21:33:43 +0200
[Beatport] Update extractor name and tests
Diffstat:
3 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/youtube_dl/extractor/beatport.py b/youtube_dl/extractor/beatport.py
@@ -0,0 +1,103 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import compat_str
+from ..utils import int_or_none
+
+
+class BeatportIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.|pro\.)?beatport\.com/track/(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
+ _TESTS = [{
+ 'url': 'https://beatport.com/track/synesthesia-original-mix/5379371',
+ 'md5': 'b3c34d8639a2f6a7f734382358478887',
+ 'info_dict': {
+ 'id': '5379371',
+ 'display_id': 'synesthesia-original-mix',
+ 'ext': 'mp4',
+ 'title': 'Froxic - Synesthesia (Original Mix)',
+ },
+ }, {
+ 'url': 'https://beatport.com/track/love-and-war-original-mix/3756896',
+ 'md5': 'e44c3025dfa38c6577fbaeb43da43514',
+ 'info_dict': {
+ 'id': '3756896',
+ 'display_id': 'love-and-war-original-mix',
+ 'ext': 'mp3',
+ 'title': 'Wolfgang Gartner - Love & War (Original Mix)',
+ },
+ }, {
+ 'url': 'https://beatport.com/track/birds-original-mix/4991738',
+ 'md5': 'a1fd8e8046de3950fd039304c186c05f',
+ 'info_dict': {
+ 'id': '4991738',
+ 'display_id': 'birds-original-mix',
+ 'ext': 'mp4',
+ 'title': "Tos, Middle Milk, Mumblin' Johnsson - Birds (Original Mix)",
+ }
+ }]
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ track_id = mobj.group('id')
+ display_id = mobj.group('display_id')
+
+ webpage = self._download_webpage(url, display_id)
+
+ playables = self._parse_json(
+ self._search_regex(
+ r'window\.Playables\s*=\s*({.+?});', webpage,
+ 'playables info', flags=re.DOTALL),
+ track_id)
+
+ track = next(t for t in playables['tracks'] if t['id'] == int(track_id))
+
+ title = ', '.join((a['name'] for a in track['artists'])) + ' - ' + track['name']
+ if track['mix']:
+ title += ' (' + track['mix'] + ')'
+
+ formats = []
+ for ext, info in track['preview'].items():
+ if not info['url']:
+ continue
+ fmt = {
+ 'url': info['url'],
+ 'ext': ext,
+ 'format_id': ext,
+ 'vcodec': 'none',
+ }
+ if ext == 'mp3':
+ fmt['preference'] = 0
+ fmt['acodec'] = 'mp3'
+ fmt['abr'] = 96
+ fmt['asr'] = 44100
+ elif ext == 'mp4':
+ fmt['preference'] = 1
+ fmt['acodec'] = 'aac'
+ fmt['abr'] = 96
+ fmt['asr'] = 44100
+ formats.append(fmt)
+ self._sort_formats(formats)
+
+ images = []
+ for name, info in track['images'].items():
+ image_url = info.get('url')
+ if name == 'dynamic' or not image_url:
+ continue
+ image = {
+ 'id': name,
+ 'url': image_url,
+ 'height': int_or_none(info.get('height')),
+ 'width': int_or_none(info.get('width')),
+ }
+ images.append(image)
+
+ return {
+ 'id': compat_str(track.get('id')) or track_id,
+ 'display_id': track.get('slug') or display_id,
+ 'title': title,
+ 'formats': formats,
+ 'thumbnails': images,
+ }
diff --git a/youtube_dl/extractor/beatportpro.py b/youtube_dl/extractor/beatportpro.py
@@ -1,103 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import int_or_none
-
-
-class BeatportProIE(InfoExtractor):
- _VALID_URL = r'https?://pro\.beatport\.com/track/(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
- _TESTS = [{
- 'url': 'https://pro.beatport.com/track/synesthesia-original-mix/5379371',
- 'md5': 'b3c34d8639a2f6a7f734382358478887',
- 'info_dict': {
- 'id': '5379371',
- 'display_id': 'synesthesia-original-mix',
- 'ext': 'mp4',
- 'title': 'Froxic - Synesthesia (Original Mix)',
- },
- }, {
- 'url': 'https://pro.beatport.com/track/love-and-war-original-mix/3756896',
- 'md5': 'e44c3025dfa38c6577fbaeb43da43514',
- 'info_dict': {
- 'id': '3756896',
- 'display_id': 'love-and-war-original-mix',
- 'ext': 'mp3',
- 'title': 'Wolfgang Gartner - Love & War (Original Mix)',
- },
- }, {
- 'url': 'https://pro.beatport.com/track/birds-original-mix/4991738',
- 'md5': 'a1fd8e8046de3950fd039304c186c05f',
- 'info_dict': {
- 'id': '4991738',
- 'display_id': 'birds-original-mix',
- 'ext': 'mp4',
- 'title': "Tos, Middle Milk, Mumblin' Johnsson - Birds (Original Mix)",
- }
- }]
-
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- track_id = mobj.group('id')
- display_id = mobj.group('display_id')
-
- webpage = self._download_webpage(url, display_id)
-
- playables = self._parse_json(
- self._search_regex(
- r'window\.Playables\s*=\s*({.+?});', webpage,
- 'playables info', flags=re.DOTALL),
- track_id)
-
- track = next(t for t in playables['tracks'] if t['id'] == int(track_id))
-
- title = ', '.join((a['name'] for a in track['artists'])) + ' - ' + track['name']
- if track['mix']:
- title += ' (' + track['mix'] + ')'
-
- formats = []
- for ext, info in track['preview'].items():
- if not info['url']:
- continue
- fmt = {
- 'url': info['url'],
- 'ext': ext,
- 'format_id': ext,
- 'vcodec': 'none',
- }
- if ext == 'mp3':
- fmt['preference'] = 0
- fmt['acodec'] = 'mp3'
- fmt['abr'] = 96
- fmt['asr'] = 44100
- elif ext == 'mp4':
- fmt['preference'] = 1
- fmt['acodec'] = 'aac'
- fmt['abr'] = 96
- fmt['asr'] = 44100
- formats.append(fmt)
- self._sort_formats(formats)
-
- images = []
- for name, info in track['images'].items():
- image_url = info.get('url')
- if name == 'dynamic' or not image_url:
- continue
- image = {
- 'id': name,
- 'url': image_url,
- 'height': int_or_none(info.get('height')),
- 'width': int_or_none(info.get('width')),
- }
- images.append(image)
-
- return {
- 'id': compat_str(track.get('id')) or track_id,
- 'display_id': track.get('slug') or display_id,
- 'title': title,
- 'formats': formats,
- 'thumbnails': images,
- }
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
@@ -94,7 +94,7 @@ from .bbc import (
from .beeg import BeegIE
from .behindkink import BehindKinkIE
from .bellmedia import BellMediaIE
-from .beatportpro import BeatportProIE
+from .beatport import BeatportIE
from .bet import BetIE
from .bigflix import BigflixIE
from .bild import BildIE
