aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/funnyordie.py
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-05-06 19:46:40 +0700
committerSergey M. <dstftw@gmail.com>2014-05-06 19:46:40 +0700
commit84a2806c166c247828405307257d80426aa98484 (patch)
treed14a5d8774e7bc338f1136bcbd1b194d2380b95d /youtube_dl/extractor/funnyordie.py
parentfcf5b017469e40b06848a0faeb31853e45794538 (diff)
parentd0111a7409e4cc071beee664d6deacbeff6ffa83 (diff)
Merge pull request #2859 from pulpe/FunnyOrDie_thumb
[FunnyOrDie] fix thumbnails + add test (fixes #2856)
Diffstat (limited to 'youtube_dl/extractor/funnyordie.py')
-rw-r--r--youtube_dl/extractor/funnyordie.py43
1 files changed, 22 insertions, 21 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 56e079288..cdd3baf80 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -8,18 +8,27 @@ from .common import InfoExtractor
class FunnyOrDieIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])'
- _TEST = {
+ _TESTS = [{
'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version',
- 'file': '0732f586d7.mp4',
'md5': 'f647e9e90064b53b6e046e75d0241fbd',
'info_dict': {
- 'description': ('Lyrics changed to match the video. Spoken cameo '
- 'by Obscurus Lupa (from ThatGuyWithTheGlasses.com). Based on a '
- 'concept by Dustin McLean (DustFilms.com). Performed, edited, '
- 'and written by David A. Scott.'),
+ 'id': '0732f586d7',
+ 'ext': 'mp4',
'title': 'Heart-Shaped Box: Literal Video Version',
+ 'description': 'md5:ea09a01bc9a1c46d9ab696c01747c338',
+ 'thumbnail': 're:^http:.*\.jpg$',
+ },
+ }, {
+ 'url': 'http://www.funnyordie.com/embed/e402820827',
+ 'md5': '0e0c5a7bf45c52b95cd16aa7f28be0b6',
+ 'info_dict': {
+ 'id': 'e402820827',
+ 'ext': 'mp4',
+ 'title': 'Please Use This Song (Jon Lajoie)',
+ 'description': 'md5:2ed27d364f5a805a6dba199faaf6681d',
+ 'thumbnail': 're:^http:.*\.jpg$',
},
- }
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@ -31,23 +40,15 @@ class FunnyOrDieIE(InfoExtractor):
[r'type="video/mp4" src="(.*?)"', r'src="([^>]*?)" type=\'video/mp4\''],
webpage, 'video URL', flags=re.DOTALL)
- if mobj.group('type') == 'embed':
- post_json = self._search_regex(
- r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
- post = json.loads(post_json)
- title = post['name']
- description = post.get('description')
- thumbnail = post.get('picture')
- else:
- title = self._og_search_title(webpage)
- description = self._og_search_description(webpage)
- thumbnail = None
+ post_json = self._search_regex(
+ r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
+ post = json.loads(post_json)
return {
'id': video_id,
'url': video_url,
'ext': 'mp4',
- 'title': title,
- 'description': description,
- 'thumbnail': thumbnail,
+ 'title': post['name'],
+ 'description': post.get('description'),
+ 'thumbnail': post.get('picture'),
}