xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-23 19:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[collegehumor] Use character strings by default

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-01-05 03:07:15 +01:00
parent 55033ffb0a
commit 7c0578dc86
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
youtube_dl/extractor/collegehumor.py
View File

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import json import json
import re import re
@ -8,23 +10,23 @@ class CollegeHumorIE(InfoExtractor):
_VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/?(?P<shorttitle>.*)$' _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/?(?P<shorttitle>.*)$'
_TESTS = [{ _TESTS = [{
u'url': u'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe', 'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
u'file': u'6902724.mp4', 'file': '6902724.mp4',
u'md5': u'dcc0f5c1c8be98dc33889a191f4c26bd', 'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd',
u'info_dict': { 'info_dict': {
u'title': u'Comic-Con Cosplay Catastrophe', 'title': 'Comic-Con Cosplay Catastrophe',
u'description': u'Fans get creative this year at San Diego. Too', 'description': 'Fans get creative this year at San Diego. Too',
u'age_limit': 13, 'age_limit': 13,
}, },
}, },
{ {
u'url': u'http://www.collegehumor.com/video/3505939/font-conference', 'url': 'http://www.collegehumor.com/video/3505939/font-conference',
u'file': u'3505939.mp4', 'file': '3505939.mp4',
u'md5': u'72fa701d8ef38664a4dbb9e2ab721816', 'md5': '72fa701d8ef38664a4dbb9e2ab721816',
u'info_dict': { 'info_dict': {
u'title': u'Font Conference', 'title': 'Font Conference',
u'description': u'This video wasn\'t long enough, so we made it double-spaced.', 'description': 'This video wasn\'t long enough, so we made it double-spaced.',
u'age_limit': 10, 'age_limit': 10,
}, },
}] }]
@ -34,7 +36,7 @@ class CollegeHumorIE(InfoExtractor):
jsonUrl = 'http://www.collegehumor.com/moogaloop/video/' + video_id + '.json' jsonUrl = 'http://www.collegehumor.com/moogaloop/video/' + video_id + '.json'
data = json.loads(self._download_webpage( data = json.loads(self._download_webpage(
jsonUrl, video_id, u'Downloading info JSON')) jsonUrl, video_id, 'Downloading info JSON'))
vdata = data['video'] vdata = data['video']
AGE_LIMITS = {'nc17': 18, 'r': 18, 'pg13': 13, 'pg': 10, 'g': 0} AGE_LIMITS = {'nc17': 18, 'r': 18, 'pg13': 13, 'pg': 10, 'g': 0}