projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[youtube-dl]
/
youtube_dl
/
extractor
/
collegehumor.py
diff --git
a/youtube_dl/extractor/collegehumor.py
b/youtube_dl/extractor/collegehumor.py
index 45d81aae596364835141d04f01e67daf81e571ff..6f866e7fcee7f401362b24d69db2285e22cfa6a4 100644
(file)
--- 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',
'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,
'age_limit': 13,
+ 'duration': 187,
},
},
{
},
},
{
@@
-28,7
+29,7
@@
class CollegeHumorIE(InfoExtractor):
'id': '3505939',
'ext': 'mp4',
'title': 'Font Conference',
'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,
},
'age_limit': 10,
'duration': 179,
},
@@
-87,6
+88,7
@@
class CollegeHumorIE(InfoExtractor):
self._sort_formats(formats)
duration = int_or_none(vdata.get('duration'), 1000)
self._sort_formats(formats)
duration = int_or_none(vdata.get('duration'), 1000)
+ like_count = int_or_none(vdata.get('likes'))
return {
'id': video_id,
return {
'id': video_id,
@@
-96,4
+98,5
@@
class CollegeHumorIE(InfoExtractor):
'formats': formats,
'age_limit': age_limit,
'duration': duration,
'formats': formats,
'age_limit': age_limit,
'duration': duration,
+ 'like_count': like_count,
}
}