X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcollegehumor.py;h=d10b7bd0cda2161838e83da741fe7a2f6c88f575;hb=adc267eebf294e9aa27c8df97307a25cd0adf83f;hp=a963f6f79febbfa9fedd88ebf046a8ad840ff14f;hpb=b4a9bf701a77fda45f5a93b0f9538a9f6b883df3;p=youtube-dl

diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py
index a963f6f79..d10b7bd0c 100644
--- a/youtube_dl/extractor/collegehumor.py
+++ b/youtube_dl/extractor/collegehumor.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import json
 import re
 
@@ -8,21 +10,23 @@ class CollegeHumorIE(InfoExtractor):
     _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/?(?P<shorttitle>.*)$'
 
     _TESTS = [{
-        u'url': u'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
-        u'file': u'6902724.mp4',
-        u'md5': u'dcc0f5c1c8be98dc33889a191f4c26bd',
-        u'info_dict': {
-            u'title': u'Comic-Con Cosplay Catastrophe',
-            u'description': u'Fans get creative this year at San Diego.  Too',
+        'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
+        'file': '6902724.mp4',
+        'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd',
+        'info_dict': {
+            'title': 'Comic-Con Cosplay Catastrophe',
+            'description': 'Fans get creative this year at San Diego.  Too',
+            'age_limit': 13,
         },
     },
     {
-        u'url': u'http://www.collegehumor.com/video/3505939/font-conference',
-        u'file': u'3505939.mp4',
-        u'md5': u'72fa701d8ef38664a4dbb9e2ab721816',
-        u'info_dict': {
-            u'title': u'Font Conference',
-            u'description': u'This video wasn\'t long enough, so we made it double-spaced.',
+        'url': 'http://www.collegehumor.com/video/3505939/font-conference',
+        'file': '3505939.mp4',
+        'md5': '72fa701d8ef38664a4dbb9e2ab721816',
+        'info_dict': {
+            'title': 'Font Conference',
+            'description': 'This video wasn\'t long enough, so we made it double-spaced.',
+            'age_limit': 10,
         },
     }]
 
@@ -32,9 +36,16 @@ class CollegeHumorIE(InfoExtractor):
 
         jsonUrl = 'http://www.collegehumor.com/moogaloop/video/' + video_id + '.json'
         data = json.loads(self._download_webpage(
-            jsonUrl, video_id, u'Downloading info JSON'))
+            jsonUrl, video_id, 'Downloading info JSON'))
         vdata = data['video']
 
+        AGE_LIMITS = {'nc17': 18, 'r': 18, 'pg13': 13, 'pg': 10, 'g': 0}
+        rating = vdata.get('rating')
+        if rating:
+            age_limit = AGE_LIMITS.get(rating.lower())
+        else:
+            age_limit = None  # None = No idea
+
         PREFS = {'high_quality': 2, 'low_quality': 0}
         formats = []
         for format_key in ('mp4', 'webm'):
@@ -45,7 +56,6 @@ class CollegeHumorIE(InfoExtractor):
                     'format': format_key,
                     'preference': PREFS.get(qname),
                 })
-
         self._sort_formats(formats)
 
         return {
@@ -54,4 +64,5 @@ class CollegeHumorIE(InfoExtractor):
             'description': vdata.get('description'),
             'thumbnail': vdata.get('thumbnail'),
             'formats': formats,
+            'age_limit': age_limit,
         }