diff options
| author | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
|---|---|---|
| committer | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
| commit | 8d212e604a86da3c924ab15fe8045ab748a8183d (patch) | |
| tree | 5bc5588e5bbe7f8dad3fb1d0bbba354f2fb9e90c /youtube_dl/extractor/funnyordie.py | |
| parent | 943f7f7a399c6fb3006eb2bd68070f28a272171f (diff) | |
| parent | 063fcc9676718fc4395b92d6e9665e7f3e9c8156 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
youtube_dl/extractor/jeuxvideo.py
Diffstat (limited to 'youtube_dl/extractor/funnyordie.py')
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 67a7e5f76..4508f0dfa 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -21,17 +21,14 @@ class FunnyOrDieIE(InfoExtractor): video_id = mobj.group('id') webpage = self._download_webpage(url, video_id) - video_url = self._html_search_regex(r'<video[^>]*>\s*<source[^>]*>\s*<source src="(?P<url>[^"]+)"', + video_url = self._search_regex(r'type: "video/mp4", src: "(.*?)"', webpage, u'video URL', flags=re.DOTALL) - title = self._html_search_regex((r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", - r'<title>(?P<title>[^<]+?)</title>'), webpage, 'title', flags=re.DOTALL) - info = { 'id': video_id, 'url': video_url, 'ext': 'mp4', - 'title': title, + 'title': self._og_search_title(webpage), 'description': self._og_search_description(webpage), } return [info] |