diff options
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/collegehumor.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py index 45d81aae5..6f866e7fc 100644 --- a/youtube_dl/extractor/collegehumor.py +++ b/youtube_dl/extractor/collegehumor.py @@ -17,8 +17,9 @@ class CollegeHumorIE(InfoExtractor): 'id': '6902724', 'ext': 'mp4', 'title': 'Comic-Con Cosplay Catastrophe', - 'description': 'Fans get creative this year', + 'description': "Fans get creative this year at San Diego. Too creative. And yes, that's really Joss Whedon.", 'age_limit': 13, + 'duration': 187, }, }, { @@ -28,7 +29,7 @@ class CollegeHumorIE(InfoExtractor): 'id': '3505939', 'ext': 'mp4', 'title': 'Font Conference', - 'description': 'This video wasn\'t long enough,', + 'description': "This video wasn't long enough, so we made it double-spaced.", 'age_limit': 10, 'duration': 179, }, @@ -87,6 +88,7 @@ class CollegeHumorIE(InfoExtractor): self._sort_formats(formats) duration = int_or_none(vdata.get('duration'), 1000) + like_count = int_or_none(vdata.get('likes')) return { 'id': video_id, @@ -96,4 +98,5 @@ class CollegeHumorIE(InfoExtractor): 'formats': formats, 'age_limit': age_limit, 'duration': duration, + 'like_count': like_count, } diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 5522e4954..56e079288 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -34,12 +34,14 @@ class FunnyOrDieIE(InfoExtractor): if mobj.group('type') == 'embed': post_json = self._search_regex( r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details') - post = json.loads(post_json)['attachment'] + 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 return { 'id': video_id, @@ -47,4 +49,5 @@ class FunnyOrDieIE(InfoExtractor): 'ext': 'mp4', 'title': title, 'description': description, + 'thumbnail': thumbnail, } |