projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bbccouk] Add friendly contry filter error message (#2184)
[youtube-dl]
/
youtube_dl
/
extractor
/
collegehumor.py
diff --git
a/youtube_dl/extractor/collegehumor.py
b/youtube_dl/extractor/collegehumor.py
index 026d023a0801190b05b721edabfd426ab2f6cafa..10c925dfe1c7d44d7d1f6abe6a72b79d12230abf 100644
(file)
--- a/
youtube_dl/extractor/collegehumor.py
+++ b/
youtube_dl/extractor/collegehumor.py
@@
-4,6
+4,7
@@
import json
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..utils import int_or_none
class CollegeHumorIE(InfoExtractor):
class CollegeHumorIE(InfoExtractor):
@@
-11,22
+12,25
@@
class CollegeHumorIE(InfoExtractor):
_TESTS = [{
'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
_TESTS = [{
'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
- 'file': '6902724.mp4',
'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd',
'info_dict': {
'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd',
'info_dict': {
+ 'id': '6902724',
+ 'ext': 'mp4',
'title': 'Comic-Con Cosplay Catastrophe',
'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',
'age_limit': 13,
},
},
{
'url': 'http://www.collegehumor.com/video/3505939/font-conference',
- 'file': '3505939.mp4',
'md5': '72fa701d8ef38664a4dbb9e2ab721816',
'info_dict': {
'md5': '72fa701d8ef38664a4dbb9e2ab721816',
'info_dict': {
+ 'id': '3505939',
+ 'ext': 'mp4',
'title': 'Font Conference',
'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,
'age_limit': 10,
+ 'duration': 179,
},
},
# embedded youtube video
},
},
# embedded youtube video
@@
-38,7
+42,7
@@
class CollegeHumorIE(InfoExtractor):
'title': 'Funny Dogs Protecting Babies Compilation 2014 [NEW HD]',
'uploader': 'Funnyplox TV',
'uploader_id': 'funnyploxtv',
'title': 'Funny Dogs Protecting Babies Compilation 2014 [NEW HD]',
'uploader': 'Funnyplox TV',
'uploader_id': 'funnyploxtv',
- 'description': 'md5:
b20fc87608e2837596bbc8df85a3c34d
',
+ 'description': 'md5:
7ded37421526d54afdf005e25bc2b7a3
',
'upload_date': '20140128',
},
'params': {
'upload_date': '20140128',
},
'params': {
@@
-82,6
+86,8
@@
class CollegeHumorIE(InfoExtractor):
})
self._sort_formats(formats)
})
self._sort_formats(formats)
+ duration = int_or_none(vdata.get('duration'), 1000)
+
return {
'id': video_id,
'title': vdata['title'],
return {
'id': video_id,
'title': vdata['title'],
@@
-89,4
+95,5
@@
class CollegeHumorIE(InfoExtractor):
'thumbnail': vdata.get('thumbnail'),
'formats': formats,
'age_limit': age_limit,
'thumbnail': vdata.get('thumbnail'),
'formats': formats,
'age_limit': age_limit,
+ 'duration': duration,
}
}