From: Sergey M․ Date: Wed, 14 Oct 2015 14:49:39 +0000 (+0600) Subject: [extractor/common] Require closing quote in _og_regexes (Closes #7174) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7a6d76a64d8a89a08bb79791506fc18b993c4580;hp=4aa353673b5404e9765a2b3e1ffbf8bb1c147d42;p=youtube-dl [extractor/common] Require closing quote in _og_regexes (Closes #7174) E.g. do not match `property='og:video:type'` when `og:video` is requested. --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 0082a4c84..a0c4af92f 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -646,7 +646,8 @@ class InfoExtractor(object): @staticmethod def _og_regexes(prop): content_re = r'content=(?:"([^>]+?)"|\'([^>]+?)\'|\s*([^\s"\'=<>`]+?))' - property_re = r'(?:name|property)=[\'"]?og:%s[\'"]?' % re.escape(prop) + property_re = (r'(?:name|property)=(?:\'og:%(prop)s\'|"og:%(prop)s"|\s*og:%(prop)s\b)' + % {'prop': re.escape(prop)}) template = r']+?%s[^>]+?%s' return [ template % (property_re, content_re),