From 0b88843460981bf7e78505387a42f9d61855d02c Mon Sep 17 00:00:00 2001 From: fnord Date: Thu, 11 Jun 2015 04:02:09 -0500 Subject: [PATCH] Generic: Return a playlist of all vimeo iframes/embeds --- youtube_dl/extractor/generic.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index f6b984300..0f0514594 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1090,17 +1090,10 @@ class GenericIE(InfoExtractor): return _playlist_from_matches(matches, ie='RtlNl') # Look for embedded (iframe) Vimeo player - mobj = re.search( - r']+?src=(["\'])(?P(?:https?:)?//player\.vimeo\.com/video/.+?)\1', webpage) - if mobj: - player_url = unescapeHTML(mobj.group('url')) - surl = smuggle_url(player_url, {'Referer': url}) - return self.url_result(surl) - # Look for embedded (swf embed) Vimeo player - mobj = re.search( - r']+?src="((?:https?:)?//(?:www\.)?vimeo\.com/moogaloop\.swf.+?)"', webpage) - if mobj: - return self.url_result(mobj.group(1)) + matches = re.findall( + r'<(?:iframe|embed)[^>]+?src=(["\'])(?P(?:https?:)?//(?:player\.vimeo\.com/video/|(?:www\.)?vimeo\.com/moogaloop\.swf).+?)\1', webpage) + if matches: + return _playlist_from_matches(matches, lambda m: smuggle_url(m[1], {'Referer': url}) ) # Look for embedded YouTube player matches = re.findall(r'''(?x)