From 83cebd73d4c8e9b83a95bd2957d52d1eb4ab17f6 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 6 Feb 2014 04:16:22 +0100 Subject: [PATCH] [collegehumor] We only get shortened descriptions now --- youtube_dl/extractor/collegehumor.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py index 079cbc4d6..ad7cf5e5f 100644 --- a/youtube_dl/extractor/collegehumor.py +++ b/youtube_dl/extractor/collegehumor.py @@ -4,6 +4,7 @@ import re from .common import InfoExtractor +from ..utils import int_or_none class CollegeHumorIE(InfoExtractor): @@ -11,22 +12,25 @@ class CollegeHumorIE(InfoExtractor): _TESTS = [{ 'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe', - 'file': '6902724.mp4', 'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd', 'info_dict': { + 'id': '6902724', + 'ext': 'mp4', 'title': 'Comic-Con Cosplay Catastrophe', - 'description': 'Fans get creative this year at San Diego. Too', + 'description': 'Fans get creative this year', 'age_limit': 13, }, }, { 'url': 'http://www.collegehumor.com/video/3505939/font-conference', - 'file': '3505939.mp4', 'md5': '72fa701d8ef38664a4dbb9e2ab721816', 'info_dict': { + 'id': '3505939', + 'ext': 'mp4', 'title': 'Font Conference', - 'description': 'This video wasn\'t long enough, so we made it double-spaced.', + 'description': 'This video wasn\'t long enough,', 'age_limit': 10, + 'duration': 179, }, }, # embedded youtube video @@ -82,6 +86,8 @@ def _real_extract(self, url): }) self._sort_formats(formats) + duration = int_or_none(vdata.get('duration'), 1000) + return { 'id': video_id, 'title': vdata['title'], @@ -89,4 +95,5 @@ def _real_extract(self, url): 'thumbnail': vdata.get('thumbnail'), 'formats': formats, 'age_limit': age_limit, + 'duration': duration, }