1
0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-13 23:07:28 +08:00

fixing comments

fixing comments
This commit is contained in:
dabiboo 2015-09-20 10:19:34 +02:00
parent 80f8fbba67
commit b86acfb128

View File

@ -84,14 +84,13 @@ class WatIE(InfoExtractor):
webpage = self._download_webpage(url, display_id or short_id) webpage = self._download_webpage(url, display_id or short_id)
srcIFrame = self._html_search_regex(r'<iframe .* src="(.*?)(.iframe)?"', webpage, 'srcIFrame') srcIFrame = self._html_search_regex(r'<iframe .* src="(.*?)(.iframe)?"', webpage, 'srcIFrame')
if (srcIFrame.__contains__("universalmusic")): if (srcIFrame.__contains__("universalmusic")):
#return universalmusicfrance.UniversalMusicFranceIE()._real_extract(srcIFrame); #should redirect to universalmusicfrance extractor
print srcIFrame
return self.url_result(srcIFrame) return self.url_result(srcIFrame)
elif (srcIFrame.__contains__("ultimedia")): elif (srcIFrame.__contains__("ultimedia")):
mobj = re.match(r'http://www\.ultimedia\.com/deliver/musique/iframe/mdtk/[0-9]*/zone/[0-9]/article/(?P<article_id>.*?)/.*', srcIFrame) mobj = re.match(r'http://www\.ultimedia\.com/deliver/musique/iframe/mdtk/[0-9]*/zone/[0-9]/article/(?P<article_id>.*?)/.*', srcIFrame)
article_id = mobj.group('article_id') article_id = mobj.group('article_id')
ultimedia_url = "http://www.ultimedia.com/default/index/videomusic/id/" + article_id ultimedia_url = "http://www.ultimedia.com/default/index/videomusic/id/" + article_id
#return ultimedia.UltimediaIE()._real_extract(ultimedia_url) #should redirect to ultimedia extractor
return self.url_result(ultimedia_url) return self.url_result(ultimedia_url)
else: else:
real_id = self._search_regex(r'xtpage = ".*-(.*?)";', webpage, 'real id') real_id = self._search_regex(r'xtpage = ".*-(.*?)";', webpage, 'real id')