summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2013-07-13 20:39:47 +0200
committerPhilipp Hagemeister <[email protected]>2013-07-13 20:39:47 +0200
commit3c4e6d833792c38a28f1dc78ad22fca99edad1fb (patch)
tree747a01f50cde34d5e3b5c27c92cff33f482f1f55
parent36034aecc287f67a9f93fa00f374f45dcb0e2f77 (diff)
downloadyoutube-dl-3c4e6d833792c38a28f1dc78ad22fca99edad1fb.tar.gz
youtube-dl-3c4e6d833792c38a28f1dc78ad22fca99edad1fb.zip
Improve OpenGraph property matching
-rw-r--r--youtube_dl/extractor/common.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 05b243871..52ae98be3 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -259,16 +259,16 @@ class InfoExtractor(object):
# Helper functions for extracting OpenGraph info
@staticmethod
- def _og_regex(property):
- return r'<meta.+?property=[\'"]og:%s[\'"].+?content=(?:"(.+?)"|\'(.+?)\')' % property
+ def _og_regex(prop):
+ return r'<meta.+?property=[\'"]og:%s[\'"].+?content=(?:"(.+?)"|\'(.+?)\')' % re.escape(prop)
- def _og_search_property(self, property, html, name=None, **kargs):
+ def _og_search_property(self, prop, html, name=None, **kargs):
if name is None:
- name = 'OpenGraph %s' % property
- return self._html_search_regex(self._og_regex(property), html, name, flags=re.DOTALL, **kargs)
+ name = 'OpenGraph %s' % prop
+ return self._html_search_regex(self._og_regex(prop), html, name, flags=re.DOTALL, **kargs)
def _og_search_thumbnail(self, html, **kargs):
- return self._og_search_property('image', html, 'thumbnail url', fatal=False, **kargs)
+ return self._og_search_property('image', html, u'thumbnail url', fatal=False, **kargs)
def _og_search_description(self, html, **kargs):
return self._og_search_property('description', html, fatal=False, **kargs)