mirror
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl.git
1
0
Fork 0
Code Releases Activity

[myspace] Cleanup

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-12-01 00:03:24 +01:00
parent 19e92770c9
commit 954f36f890
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/myspace.py
View File

@ -36,7 +36,6 @@ class MySpaceIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '93388656', 'id': '93388656',
'ext': 'flv', 'ext': 'flv',
'playlist': 'The Demo',
'title': 'Of weakened soul...', 'title': 'Of weakened soul...',
'uploader': 'Killsorrow', 'uploader': 'Killsorrow',
'uploader_id': 'killsorrow', 'uploader_id': 'killsorrow',
@ -85,13 +84,14 @@ class MySpaceIE(InfoExtractor):
r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id, r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id,
webpage, 'song_data', default=None, group=0) webpage, 'song_data', default=None, group=0)
if song_data is None: if song_data is None:
self.to_screen( # some songs in an album are not playable
self.report_warning(
'%s: No downloadable song on this page' % video_id) '%s: No downloadable song on this page' % video_id)
return return
def search_data(name): def search_data(name):
return self._search_regex( return self._search_regex(
r'''data-%s=([\'"])(.*?)\1''' % name, r'''data-%s=([\'"])(?P<data>.*?)\1''' % name,
song_data, name, default='', group=2) song_data, name, default='', group='data')
streamUrl = search_data('stream-url') streamUrl = search_data('stream-url')
if not streamUrl: if not streamUrl:
vevo_id = search_data('vevo-id') vevo_id = search_data('vevo-id')
@ -110,7 +110,6 @@ class MySpaceIE(InfoExtractor):
'title': self._og_search_title(webpage), 'title': self._og_search_title(webpage),
'uploader': search_data('artist-name'), 'uploader': search_data('artist-name'),
'uploader_id': search_data('artist-username'), 'uploader_id': search_data('artist-username'),
'playlist': search_data('album-title'),
'thumbnail': self._og_search_thumbnail(webpage), 'thumbnail': self._og_search_thumbnail(webpage),
} }
else: else:
@ -165,16 +164,16 @@ class MySpaceAlbumIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
tracks_paths = re.findall(r'"music:song" content="(.*?)"', webpage) tracks_paths = re.findall(r'"music:song" content="(.*?)"', webpage)
if not tracks_paths: if not tracks_paths:
self.to_screen('%s: No songs found, try using proxy' % display_id) raise ExtractorError(
return '%s: No songs found, try using proxy' % display_id,
expected=True)
entries = [ entries = [
self.url_result(t_path, ie=MySpaceIE.ie_key()) self.url_result(t_path, ie=MySpaceIE.ie_key())
for t_path in tracks_paths] for t_path in tracks_paths]
title = self._og_search_title(webpage)
return { return {
'_type': 'playlist', '_type': 'playlist',
'id': playlist_id, 'id': playlist_id,
'display_id': display_id, 'display_id': display_id,
'title': title, 'title': self._og_search_title(webpage),
'entries': entries, 'entries': entries,
} }