Update myspace.py
This commit is contained in:
parent
901fac8b27
commit
47ed1af55f
@ -48,6 +48,8 @@ class MySpaceIE(InfoExtractor):
|
|||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
player_url = self._search_regex(
|
||||||
|
r'playerSwf":"([^"?]*)', webpage, 'player URL')
|
||||||
|
|
||||||
if mobj.group('mediatype').startswith('music/song'):
|
if mobj.group('mediatype').startswith('music/song'):
|
||||||
# songs don't store any useful info in the 'context' variable
|
# songs don't store any useful info in the 'context' variable
|
||||||
@ -79,6 +81,33 @@ class MySpaceIE(InfoExtractor):
|
|||||||
info.update({
|
info.update({
|
||||||
'url': rtmp_url,
|
'url': rtmp_url,
|
||||||
'play_path': play_path,
|
'play_path': play_path,
|
||||||
|
'player_url': player_url,
|
||||||
'ext': 'flv',
|
'ext': 'flv',
|
||||||
})
|
})
|
||||||
return info
|
return info
|
||||||
|
|
||||||
|
|
||||||
|
class MySpaceAlbumIE(InfoExtractor):
|
||||||
|
IE_NAME = 'MySpace:album'
|
||||||
|
_VALID_URL = r'https?://myspace\.com/([^/]+)/music/album/(?P<title>.*?)(?P<id>\d+)'
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
mobj = re.match(self._VALID_URL, url)
|
||||||
|
playlist_id = mobj.group('id')
|
||||||
|
display_id = mobj.group('title') + playlist_id
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
tracks_paths = re.findall(r'"music:song" content="(.*?)"', webpage)
|
||||||
|
if not tracks_paths:
|
||||||
|
raise ExtractorError('The page doesn\'t contain any tracks')
|
||||||
|
entries = [
|
||||||
|
self.url_result(t_path, ie=MySpaceIE.ie_key())
|
||||||
|
for t_path in tracks_paths]
|
||||||
|
title = self._search_regex(
|
||||||
|
r'"og:title" content="(.*?)"', webpage, 'title')
|
||||||
|
return {
|
||||||
|
'_type': 'playlist',
|
||||||
|
'id': playlist_id,
|
||||||
|
'display_id': display_id,
|
||||||
|
'title': title,
|
||||||
|
'entries': entries,
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user