From: Joey Adams Date: Sat, 12 Oct 2013 01:52:30 +0000 (-0400) Subject: Fix Brightcove detection when another Flash object is on the page X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=32835331496e0a77cf7b21f34b80b2ae6e9142a5;p=youtube-dl Fix Brightcove detection when another Flash object is on the page The regex used non-greedy match, but alas it failed on input like this: " to appear before BrightcoveExperience. Video in question: http://www.harpercollinschildrens.com/feature/petethecat/ --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 7060c6f92..d48c84f8d 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -121,7 +121,7 @@ class GenericIE(InfoExtractor): self.report_extraction(video_id) # Look for BrightCove: - m_brightcove = re.search(r'', webpage, re.DOTALL) + m_brightcove = re.search(r']+?class=([\'"])[^>]*?BrightcoveExperience.*?\1.+?', webpage, re.DOTALL) if m_brightcove is not None: self.to_screen(u'Brightcove video detected.') bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())