1
1
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-30 19:02:55 +01:00

[myspace] More robust mediatype check

This commit is contained in:
Philipp Hagemeister 2014-01-20 02:44:08 +01:00
parent efb1bb90a0
commit 5016f3eac8

View File

@ -10,7 +10,7 @@ from ..utils import (
class MySpaceIE(InfoExtractor): class MySpaceIE(InfoExtractor):
_VALID_URL = r'https?://myspace\.com/([^/]+)/(?:video/[^/]+/|music/song/.*?)(?P<id>\d+)' _VALID_URL = r'https?://myspace\.com/([^/]+)/(?P<mediatype>video/[^/]+/|music/song/.*?)(?P<id>\d+)'
_TESTS = [ _TESTS = [
{ {
@ -49,7 +49,7 @@ class MySpaceIE(InfoExtractor):
video_id = mobj.group('id') video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
if 'music/song' in url: 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
def search_data(name): def search_data(name):
return self._search_regex(r'data-%s="(.*?)"' % name, webpage, return self._search_regex(r'data-%s="(.*?)"' % name, webpage,