Merge tag 'upstream/2014.01.17.2'

[youtubedl] / youtube_dl / extractor / youjizz.py

diff --git a/youtube_dl/extractor/youjizz.py b/youtube_dl/extractor/youjizz.py
index 1265639e821bd873b74aeea08811f8c22e966ba1..e971b5b4b3a32b801edb12efb429c8228417c307 100644 (file)
--- a/youtube_dl/extractor/youjizz.py
+++ b/youtube_dl/extractor/youjizz.py
@@ -7,13 +7,14 @@ from ..utils import (
 
 
 class YouJizzIE(InfoExtractor):
 
 
 class YouJizzIE(InfoExtractor):

-    _VALID_URL = r'^(?:https?://)?(?:\w+\.)?youjizz\.com/videos/(?P<videoid>[^.]+).html$'
+    _VALID_URL = r'^(?:https?://)?(?:\w+\.)?youjizz\.com/videos/(?P<videoid>[^.]+)\.html$'

     _TEST = {
         u'url': u'http://www.youjizz.com/videos/zeichentrick-1-2189178.html',
         u'file': u'2189178.flv',
         u'md5': u'07e15fa469ba384c7693fd246905547c',
         u'info_dict': {
     _TEST = {
         u'url': u'http://www.youjizz.com/videos/zeichentrick-1-2189178.html',
         u'file': u'2189178.flv',
         u'md5': u'07e15fa469ba384c7693fd246905547c',
         u'info_dict': {

-            u"title": u"Zeichentrick 1"
+            u"title": u"Zeichentrick 1",
+            u"age_limit": 18,

         }
     }
 
         }
     }
 


@@ -25,6 +26,8 @@ class YouJizzIE(InfoExtractor):
         # Get webpage content
         webpage = self._download_webpage(url, video_id)
 
         # Get webpage content
         webpage = self._download_webpage(url, video_id)
 

+        age_limit = self._rta_search(webpage)
+

         # Get the video title
         video_title = self._html_search_regex(r'<title>(?P<title>.*)</title>',
             webpage, u'title').strip()
         # Get the video title
         video_title = self._html_search_regex(r'<title>(?P<title>.*)</title>',
             webpage, u'title').strip()


@@ -60,6 +63,7 @@ class YouJizzIE(InfoExtractor):
                 'title': video_title,
                 'ext': 'flv',
                 'format': 'flv',
                 'title': video_title,
                 'ext': 'flv',
                 'format': 'flv',

-                'player_url': embed_page_url}
+                'player_url': embed_page_url,
+                'age_limit': age_limit}

 
         return [info]
 
         return [info]