mirror of
https://github.com/l1ving/youtube-dl
synced 2024-12-22 19:52:53 +08:00
[myspace] fix extraction and extract hls and http formats
This commit is contained in:
parent
605fd6392f
commit
f65dba7cdb
@ -17,9 +17,10 @@ class MySpaceIE(InfoExtractor):
|
|||||||
_TESTS = [
|
_TESTS = [
|
||||||
{
|
{
|
||||||
'url': 'https://myspace.com/fiveminutestothestage/video/little-big-town/109594919',
|
'url': 'https://myspace.com/fiveminutestothestage/video/little-big-town/109594919',
|
||||||
|
'md5': '9c1483c106f4a695c47d2911feed50a7',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '109594919',
|
'id': '109594919',
|
||||||
'ext': 'flv',
|
'ext': 'mp4',
|
||||||
'title': 'Little Big Town',
|
'title': 'Little Big Town',
|
||||||
'description': 'This country quartet was all smiles while playing a sold out show at the Pacific Amphitheatre in Orange County, California.',
|
'description': 'This country quartet was all smiles while playing a sold out show at the Pacific Amphitheatre in Orange County, California.',
|
||||||
'uploader': 'Five Minutes to the Stage',
|
'uploader': 'Five Minutes to the Stage',
|
||||||
@ -27,37 +28,30 @@ class MySpaceIE(InfoExtractor):
|
|||||||
'timestamp': 1414108751,
|
'timestamp': 1414108751,
|
||||||
'upload_date': '20141023',
|
'upload_date': '20141023',
|
||||||
},
|
},
|
||||||
'params': {
|
|
||||||
# rtmp download
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
# songs
|
# songs
|
||||||
{
|
{
|
||||||
'url': 'https://myspace.com/killsorrow/music/song/of-weakened-soul...-93388656-103880681',
|
'url': 'https://myspace.com/killsorrow/music/song/of-weakened-soul...-93388656-103880681',
|
||||||
|
'md5': '1d7ee4604a3da226dd69a123f748b262',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '93388656',
|
'id': '93388656',
|
||||||
'ext': 'flv',
|
'ext': 'm4a',
|
||||||
'title': 'Of weakened soul...',
|
'title': 'Of weakened soul...',
|
||||||
'uploader': 'Killsorrow',
|
'uploader': 'Killsorrow',
|
||||||
'uploader_id': 'killsorrow',
|
'uploader_id': 'killsorrow',
|
||||||
},
|
},
|
||||||
'params': {
|
|
||||||
# rtmp download
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
}, {
|
}, {
|
||||||
'add_ie': ['Vevo'],
|
'add_ie': ['Youtube'],
|
||||||
'url': 'https://myspace.com/threedaysgrace/music/song/animal-i-have-become-28400208-28218041',
|
'url': 'https://myspace.com/threedaysgrace/music/song/animal-i-have-become-28400208-28218041',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'USZM20600099',
|
'id': 'xqds0B_meys',
|
||||||
'ext': 'mp4',
|
'ext': 'webm',
|
||||||
'title': 'Animal I Have Become',
|
'title': 'Three Days Grace - Animal I Have Become',
|
||||||
'uploader': 'Three Days Grace',
|
'description': 'md5:8bd86b3693e72a077cf863a8530c54bb',
|
||||||
'timestamp': int,
|
'uploader': 'ThreeDaysGraceVEVO',
|
||||||
'upload_date': '20060502',
|
'uploader_id': 'ThreeDaysGraceVEVO',
|
||||||
|
'upload_date': '20091002',
|
||||||
},
|
},
|
||||||
'skip': 'VEVO is only available in some countries',
|
|
||||||
}, {
|
}, {
|
||||||
'add_ie': ['Youtube'],
|
'add_ie': ['Youtube'],
|
||||||
'url': 'https://myspace.com/starset2/music/song/first-light-95799905-106964426',
|
'url': 'https://myspace.com/starset2/music/song/first-light-95799905-106964426',
|
||||||
@ -76,24 +70,46 @@ class MySpaceIE(InfoExtractor):
|
|||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
|
is_song = mobj.group('mediatype').startswith('music/song')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
player_url = self._search_regex(
|
player_url = self._search_regex(
|
||||||
r'playerSwf":"([^"?]*)', webpage, 'player URL')
|
r'videoSwf":"([^"?]*)', webpage, 'player URL', fatal=False)
|
||||||
|
|
||||||
def rtmp_format_from_stream_url(stream_url, width=None, height=None):
|
def formats_from_stream_urls(stream_url, hls_stream_url, http_stream_url, width=None, height=None):
|
||||||
rtmp_url, play_path = stream_url.split(';', 1)
|
formats = []
|
||||||
return {
|
vcodec = 'none' if is_song else None
|
||||||
'format_id': 'rtmp',
|
if hls_stream_url:
|
||||||
'url': rtmp_url,
|
formats.append({
|
||||||
'play_path': play_path,
|
'format_id': 'hls',
|
||||||
'player_url': player_url,
|
'url': hls_stream_url,
|
||||||
'protocol': 'rtmp',
|
'protocol': 'm3u8_native',
|
||||||
'ext': 'flv',
|
'ext': 'm4a' if is_song else 'mp4',
|
||||||
'width': width,
|
'vcodec': vcodec,
|
||||||
'height': height,
|
})
|
||||||
}
|
if stream_url and player_url:
|
||||||
|
rtmp_url, play_path = stream_url.split(';', 1)
|
||||||
|
formats.append({
|
||||||
|
'format_id': 'rtmp',
|
||||||
|
'url': rtmp_url,
|
||||||
|
'play_path': play_path,
|
||||||
|
'player_url': player_url,
|
||||||
|
'protocol': 'rtmp',
|
||||||
|
'ext': 'flv',
|
||||||
|
'width': width,
|
||||||
|
'height': height,
|
||||||
|
'vcodec': vcodec,
|
||||||
|
})
|
||||||
|
if http_stream_url:
|
||||||
|
formats.append({
|
||||||
|
'format_id': 'http',
|
||||||
|
'url': http_stream_url,
|
||||||
|
'width': width,
|
||||||
|
'height': height,
|
||||||
|
'vcodec': vcodec,
|
||||||
|
})
|
||||||
|
return formats
|
||||||
|
|
||||||
if mobj.group('mediatype').startswith('music/song'):
|
if is_song:
|
||||||
# songs don't store any useful info in the 'context' variable
|
# songs don't store any useful info in the 'context' variable
|
||||||
song_data = self._search_regex(
|
song_data = self._search_regex(
|
||||||
r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id,
|
r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id,
|
||||||
@ -108,8 +124,10 @@ class MySpaceIE(InfoExtractor):
|
|||||||
return self._search_regex(
|
return self._search_regex(
|
||||||
r'''data-%s=([\'"])(?P<data>.*?)\1''' % name,
|
r'''data-%s=([\'"])(?P<data>.*?)\1''' % name,
|
||||||
song_data, name, default='', group='data')
|
song_data, name, default='', group='data')
|
||||||
stream_url = search_data('stream-url')
|
formats = formats_from_stream_urls(
|
||||||
if not stream_url:
|
search_data('stream-url'), search_data('hls-stream-url'),
|
||||||
|
search_data('http-stream-url'))
|
||||||
|
if not formats:
|
||||||
vevo_id = search_data('vevo-id')
|
vevo_id = search_data('vevo-id')
|
||||||
youtube_id = search_data('youtube-id')
|
youtube_id = search_data('youtube-id')
|
||||||
if vevo_id:
|
if vevo_id:
|
||||||
@ -121,6 +139,7 @@ class MySpaceIE(InfoExtractor):
|
|||||||
else:
|
else:
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'Found song but don\'t know how to download it')
|
'Found song but don\'t know how to download it')
|
||||||
|
self._sort_formats(formats)
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': self._og_search_title(webpage),
|
'title': self._og_search_title(webpage),
|
||||||
@ -128,27 +147,16 @@ class MySpaceIE(InfoExtractor):
|
|||||||
'uploader_id': search_data('artist-username'),
|
'uploader_id': search_data('artist-username'),
|
||||||
'thumbnail': self._og_search_thumbnail(webpage),
|
'thumbnail': self._og_search_thumbnail(webpage),
|
||||||
'duration': int_or_none(search_data('duration')),
|
'duration': int_or_none(search_data('duration')),
|
||||||
'formats': [rtmp_format_from_stream_url(stream_url)]
|
'formats': formats,
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
video = self._parse_json(self._search_regex(
|
video = self._parse_json(self._search_regex(
|
||||||
r'context = ({.*?});', webpage, 'context'),
|
r'context = ({.*?});', webpage, 'context'),
|
||||||
video_id)['video']
|
video_id)['video']
|
||||||
formats = []
|
formats = formats_from_stream_urls(
|
||||||
hls_stream_url = video.get('hlsStreamUrl')
|
video.get('streamUrl'), video.get('hlsStreamUrl'),
|
||||||
if hls_stream_url:
|
video.get('mp4StreamUrl'), int_or_none(video.get('width')),
|
||||||
formats.append({
|
int_or_none(video.get('height')))
|
||||||
'format_id': 'hls',
|
|
||||||
'url': hls_stream_url,
|
|
||||||
'protocol': 'm3u8_native',
|
|
||||||
'ext': 'mp4',
|
|
||||||
})
|
|
||||||
stream_url = video.get('streamUrl')
|
|
||||||
if stream_url:
|
|
||||||
formats.append(rtmp_format_from_stream_url(
|
|
||||||
stream_url,
|
|
||||||
int_or_none(video.get('width')),
|
|
||||||
int_or_none(video.get('height'))))
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
Loading…
Reference in New Issue
Block a user