diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 789f9872e..139173016 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -920,36 +920,57 @@ class YahooIE(InfoExtractor): if mobj is None: raise ExtractorError(u'Invalid URL: %s' % url) video_id = mobj.group('id') + webpage = self._download_webpage(url, video_id) + m_id = re.search(r'YUI\.namespace\("Media"\)\.CONTENT_ID = "(?P.+?)";', webpage) - # TODO: Check which url parameters are required - info_url = 'http://cosmos.bcst.yahoo.com/rest/v2/pops;lmsoverride=1;outputformat=mrss;cb=974419660;id=%s;rd=news.yahoo.com;datacontext=mdb;lg=KCa2IihxG3qE60vQ7HtyUy' % video_id - webpage = self._download_webpage(info_url, video_id, "Downloading info webpage") - info_re = r'''<!\[CDATA\[(?P<title>.*?)\]\]>.* - .*?)\]\]>.* - .*?)\ .*\]\]>.* - .*?)\]\]>.* + .*?)\]\]>.* + .*?)\ .*\]\]>.* +