diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 |
commit | 36034aecc287f67a9f93fa00f374f45dcb0e2f77 (patch) | |
tree | a24389f75c738587a46f09eb0888b457b50767f8 /youtube_dl/extractor/liveleak.py | |
parent | ffca4b5c32280e416131faf43afa0cb26c55c8b0 (diff) | |
parent | 44dbe8903580e1e62ea6f3881b2fa469853c4a83 (diff) |
Merge remote-tracking branch 'jaimeMF/opengraph'
Diffstat (limited to 'youtube_dl/extractor/liveleak.py')
-rw-r--r-- | youtube_dl/extractor/liveleak.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index cf8a2c931..dd062a14e 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -33,11 +33,9 @@ class LiveLeakIE(InfoExtractor): video_url = self._search_regex(r'file: "(.*?)",', webpage, u'video URL') - video_title = self._html_search_regex(r'<meta property="og:title" content="(?P<title>.*?)"', - webpage, u'title').replace('LiveLeak.com -', '').strip() + video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip() - video_description = self._html_search_regex(r'<meta property="og:description" content="(?P<desc>.*?)"', - webpage, u'description', fatal=False) + video_description = self._og_search_description(webpage) video_uploader = self._html_search_regex(r'By:.*?(\w+)</a>', webpage, u'uploader', fatal=False) |