mirror of https://github.com/yt-dlp/yt-dlp.git
Merge d53a263d12
into b207d26f83
This commit is contained in:
commit
e46b14e39d
|
@ -1,20 +1,32 @@
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_str
|
from ..compat import compat_str
|
||||||
from ..utils import int_or_none
|
from ..utils import (
|
||||||
|
determine_ext,
|
||||||
|
int_or_none,
|
||||||
|
join_nonempty,
|
||||||
|
merge_dicts,
|
||||||
|
parse_iso8601,
|
||||||
|
T,
|
||||||
|
traverse_obj,
|
||||||
|
txt_or_none,
|
||||||
|
unified_strdate,
|
||||||
|
url_or_none,
|
||||||
|
variadic,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class BeatportIE(InfoExtractor):
|
class BeatportIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.|pro\.)?beatport\.com/track/(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
|
_VALID_URL = r'https?://(?:www\.|pro\.)?beatport\.com/track/(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://beatport.com/track/synesthesia-original-mix/5379371',
|
'url': 'https://beatport.com/track/synesthesia-original-mix/5379371',
|
||||||
'md5': 'b3c34d8639a2f6a7f734382358478887',
|
'md5': 'cfcc245aafcad52a837b2c5a60a472c9',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '5379371',
|
'id': '5379371',
|
||||||
'display_id': 'synesthesia-original-mix',
|
'display_id': 'synesthesia-original-mix',
|
||||||
'ext': 'mp4',
|
'ext': 'mp3',
|
||||||
'title': 'Froxic - Synesthesia (Original Mix)',
|
'title': 'Froxic - Synesthesia (Original Mix)',
|
||||||
|
'timestamp': 1397854513,
|
||||||
|
'upload_date': '20140428',
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://beatport.com/track/love-and-war-original-mix/3756896',
|
'url': 'https://beatport.com/track/love-and-war-original-mix/3756896',
|
||||||
|
@ -24,19 +36,85 @@ class BeatportIE(InfoExtractor):
|
||||||
'display_id': 'love-and-war-original-mix',
|
'display_id': 'love-and-war-original-mix',
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
'title': 'Wolfgang Gartner - Love & War (Original Mix)',
|
'title': 'Wolfgang Gartner - Love & War (Original Mix)',
|
||||||
|
'timestamp': 1346195831,
|
||||||
|
'upload_date': '20120917',
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://beatport.com/track/birds-original-mix/4991738',
|
'url': 'https://beatport.com/track/birds-original-mix/4991738',
|
||||||
'md5': 'a1fd8e8046de3950fd039304c186c05f',
|
'md5': '2dff00955b13c182931a708d979801b6',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '4991738',
|
'id': '4991738',
|
||||||
'display_id': 'birds-original-mix',
|
'display_id': 'birds-original-mix',
|
||||||
'ext': 'mp4',
|
'ext': 'mp3',
|
||||||
'title': "Tos, Middle Milk, Mumblin' Johnsson - Birds (Original Mix)",
|
'title': "Tos, Middle Milk, Mumblin' Johnsson - Birds (Original Mix)",
|
||||||
|
'timestamp': 1386121876,
|
||||||
|
'upload_date': '20131209',
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
mobj = self._match_valid_url(url)
|
||||||
|
track_id, display_id = mobj.group('id', 'display_id')
|
||||||
|
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
|
||||||
|
next_data = self._search_nextjs_data(webpage, display_id, fatal=False)
|
||||||
|
if not next_data:
|
||||||
|
return self._old_real_extract(url)
|
||||||
|
|
||||||
|
track = traverse_obj(
|
||||||
|
next_data,
|
||||||
|
('props', 'pageProps', lambda k, v: k == 'track' and v['id'] == int(track_id)),
|
||||||
|
get_all=False)
|
||||||
|
|
||||||
|
title = track['name']
|
||||||
|
artists = ', '.join(traverse_obj(track, ('artists', Ellipsis, 'name', T(txt_or_none)))) or None
|
||||||
|
title = join_nonempty(artists, title, delim=' - ')
|
||||||
|
title = join_nonempty(
|
||||||
|
title, traverse_obj(track, ('mix_name', T(lambda s: '(' + s + ')'))),
|
||||||
|
delim=' ')
|
||||||
|
|
||||||
|
formats = []
|
||||||
|
# next.js page has <= 1 sample URL
|
||||||
|
f_url = traverse_obj(track, ('sample_url', T(url_or_none)))
|
||||||
|
if f_url:
|
||||||
|
ext = determine_ext(f_url)
|
||||||
|
fmt = {
|
||||||
|
'url': f_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)
|
||||||
|
|
||||||
|
return merge_dicts({
|
||||||
|
'id': track_id,
|
||||||
|
'display_id': display_id,
|
||||||
|
'title': title,
|
||||||
|
'formats': formats,
|
||||||
|
'artists': artists,
|
||||||
|
}, traverse_obj(track, {
|
||||||
|
'disc_number': ('catalog_number', T(int_or_none)),
|
||||||
|
'timestamp': ('encoded_date', T(parse_iso8601)),
|
||||||
|
'categories': ('genre', 'name', T(txt_or_none), T(variadic)),
|
||||||
|
'thumbnail': ('image', 'uri', T(url_or_none)),
|
||||||
|
'upload_date': (('new_release_date', 'publish_date'), T(unified_strdate)),
|
||||||
|
'track_number': ('number', T(int_or_none)),
|
||||||
|
'album': ('release', 'name', T(txt_or_none)),
|
||||||
|
}, get_all=False))
|
||||||
|
|
||||||
|
def _old_real_extract(self, url):
|
||||||
mobj = self._match_valid_url(url)
|
mobj = self._match_valid_url(url)
|
||||||
track_id = mobj.group('id')
|
track_id = mobj.group('id')
|
||||||
display_id = mobj.group('display_id')
|
display_id = mobj.group('display_id')
|
||||||
|
@ -45,8 +123,10 @@ class BeatportIE(InfoExtractor):
|
||||||
|
|
||||||
playables = self._parse_json(
|
playables = self._parse_json(
|
||||||
self._search_regex(
|
self._search_regex(
|
||||||
r'window\.Playables\s*=\s*({.+?});', webpage,
|
# r'window\.Playables\s*=\s*({.+?});', webpage,
|
||||||
'playables info', flags=re.DOTALL),
|
# 'playables info', flags=re.DOTALL),
|
||||||
|
r'(?s)window\.Playables\s*=\s*({.+?});', webpage,
|
||||||
|
'playables info'),
|
||||||
track_id)
|
track_id)
|
||||||
|
|
||||||
track = next(t for t in playables['tracks'] if t['id'] == int(track_id))
|
track = next(t for t in playables['tracks'] if t['id'] == int(track_id))
|
||||||
|
|
|
@ -8,3 +8,11 @@ del passthrough_module
|
||||||
from .traversal import *
|
from .traversal import *
|
||||||
from ._utils import *
|
from ._utils import *
|
||||||
from ._utils import _configuration_args, _get_exe_version_output # noqa: F401
|
from ._utils import _configuration_args, _get_exe_version_output # noqa: F401
|
||||||
|
|
||||||
|
def txt_or_none(v, default=None):
|
||||||
|
""" Combine str/strip_or_none, disallow blank value (for traverse_obj) """
|
||||||
|
return default if v is None else (str(v).strip() or default)
|
||||||
|
|
||||||
|
def T(x):
|
||||||
|
""" For use in yt-dl instead of {type} or set((type,)) """
|
||||||
|
return set((x,))
|
||||||
|
|
Loading…
Reference in New Issue