diff options
| author | Allan Zhou <allanzp@gmail.com> | 2013-08-21 10:53:42 -0700 |
|---|---|---|
| committer | Allan Zhou <allanzp@gmail.com> | 2013-08-21 10:53:42 -0700 |
| commit | 5af7e056a746ad9d0dbfd82470fb216addaf9dbd (patch) | |
| tree | 2924f2d6ed4791c49f6642a80287f99ebbb401e0 /youtube_dl/extractor/funnyordie.py | |
| parent | a3f62b8255120acda6d429d2a3ce53b13e871c5d (diff) | |
| parent | 45ed795cb0aada683963b74bd001a872edc6b06b (diff) | |
| download | hypervideo-pre-5af7e056a746ad9d0dbfd82470fb216addaf9dbd.tar.lz hypervideo-pre-5af7e056a746ad9d0dbfd82470fb216addaf9dbd.tar.xz hypervideo-pre-5af7e056a746ad9d0dbfd82470fb216addaf9dbd.zip | |
Merge remote-tracking branch 'upstream/master'
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] |