diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-12 19:00:19 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-12 22:12:04 +0200 |
| commit | 46720279c28afb646b6ac19bcb11e85bb4bea726 (patch) | |
| tree | c38b786e0176511bfbe5295a8a73582b121018fc /youtube_dl/extractor/flickr.py | |
| parent | d8269e1dfbe06d4b373211e54476bcd326f69abe (diff) | |
| download | youtube-dl-46720279c28afb646b6ac19bcb11e85bb4bea726.tar.xz | |
InfoExtractor: add some helper methods to extract OpenGraph info
Diffstat (limited to 'youtube_dl/extractor/flickr.py')
| -rw-r--r-- | youtube_dl/extractor/flickr.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index bd97bff9a..80d96baf7 100644 --- a/youtube_dl/extractor/flickr.py +++ b/youtube_dl/extractor/flickr.py @@ -47,21 +47,12 @@ class FlickrIE(InfoExtractor): raise ExtractorError(u'Unable to extract video url') video_url = mobj.group(1) + unescapeHTML(mobj.group(2)) - video_title = self._html_search_regex(r'<meta property="og:title" content=(?:"([^"]+)"|\'([^\']+)\')', - webpage, u'video title') - - video_description = self._html_search_regex(r'<meta property="og:description" content=(?:"([^"]+)"|\'([^\']+)\')', - webpage, u'description', fatal=False) - - thumbnail = self._html_search_regex(r'<meta property="og:image" content=(?:"([^"]+)"|\'([^\']+)\')', - webpage, u'thumbnail', fatal=False) - return [{ 'id': video_id, 'url': video_url, 'ext': 'mp4', - 'title': video_title, - 'description': video_description, - 'thumbnail': thumbnail, + 'title': self._og_search_title(webpage), + 'description': self._og_search_description(webpage), + 'thumbnail': self._og_search_thumbnail(webpage), 'uploader_id': video_uploader_id, }] |