From: Philipp Hagemeister Date: Wed, 15 Oct 2014 11:50:53 +0000 (+0200) Subject: [generic] Correct handling of embedded vimeo players (#3955) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=09a42738fc5a060208cad5fa5579688225e53464;p=youtube-dl [generic] Correct handling of embedded vimeo players (#3955) --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 122763a23..158dc95a5 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -609,13 +609,13 @@ class GenericIE(InfoExtractor): if mobj: player_url = unescapeHTML(mobj.group('url')) surl = smuggle_url(player_url, {'Referer': url}) - return self.url_result(surl, 'Vimeo') + return self.url_result(surl) # Look for embedded (swf embed) Vimeo player mobj = re.search( - r']+?src="(https?://(?:www\.)?vimeo\.com/moogaloop\.swf.+?)"', webpage) + r']+?src="((?:https?:)?//(?:www\.)?vimeo\.com/moogaloop\.swf.+?)"', webpage) if mobj: - return self.url_result(mobj.group(1), 'Vimeo') + return self.url_result(mobj.group(1)) # Look for embedded YouTube player matches = re.findall(r'''(?x)