projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1409 from JohnyMoSwag/master (closes #1404)
[youtube-dl]
/
youtube_dl
/
extractor
/
funnyordie.py
diff --git
a/youtube_dl/extractor/funnyordie.py
b/youtube_dl/extractor/funnyordie.py
index 64363dcd51d687fe749ead55f5fc0efc4c04d31c..f3d86a711c749734e78b210682f034d37e4536cb 100644
(file)
--- 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_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)
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',
info = {
'id': video_id,
'url': video_url,
'ext': 'mp4',
- 'title':
title
,
- 'description': self._og_search_description(webpage
, flags=re.DOTALL
),
+ 'title':
self._og_search_title(webpage)
,
+ 'description': self._og_search_description(webpage),
}
return [info]
}
return [info]