X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftube8.py;h=d4b7603c7c96a5da148ff50869559b0ff0c11a0f;hb=a56f9de156c7cca29dfa45de1dadc66e10a265f2;hp=b7e7d984d05d4ea6ab19005f270f863abbbfa318;hpb=1d45a23b745cdbb361dd5cef8f848f7ebcfa8f5a;p=youtube-dl

diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py
index b7e7d984d..d4b7603c7 100644
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dl/extractor/tube8.py
@@ -13,7 +13,7 @@ from ..aes import (
 )
 
 class Tube8IE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>tube8.com/[^/]+/[^/]+/(?P<videoid>[0-9]+)/?)'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>tube8\.com/[^/]+/[^/]+/(?P<videoid>[0-9]+)/?)'
     _TEST = {
         u'url': u'http://www.tube8.com/teen/kasia-music-video/229795/',
         u'file': u'229795.mp4',
@@ -22,6 +22,7 @@ class Tube8IE(InfoExtractor):
             u"description": u"hot teen Kasia grinding", 
             u"uploader": u"unknown", 
             u"title": u"Kasia music video",
+            u"age_limit": 18,
         }
     }
 
@@ -36,7 +37,7 @@ class Tube8IE(InfoExtractor):
 
         video_title = self._html_search_regex(r'videotitle	="([^"]+)', webpage, u'title')
         video_description = self._html_search_regex(r'>Description:</strong>(.+?)<', webpage, u'description', fatal=False)
-        video_uploader = self._html_search_regex(r'>Submitted by:</strong>(?:\w|<[^>]*>)*(.+?)<', webpage, u'uploader', fatal=False)
+        video_uploader = self._html_search_regex(r'>Submitted by:</strong>(?:\s|<[^>]*>)*(.+?)<', webpage, u'uploader', fatal=False)
         thumbnail = self._html_search_regex(r'"image_url":"([^"]+)', webpage, u'thumbnail', fatal=False)
         if thumbnail:
             thumbnail = thumbnail.replace('\\/', '/')
@@ -45,10 +46,10 @@ class Tube8IE(InfoExtractor):
         if webpage.find('"encrypted":true')!=-1:
             password = self._html_search_regex(r'"video_title":"([^"]+)', webpage, u'password')
             video_url = aes_decrypt_text(video_url, password, 32).decode('utf-8')
-        path = compat_urllib_parse_urlparse( video_url ).path
-        extension = os.path.splitext( path )[1][1:]
+        path = compat_urllib_parse_urlparse(video_url).path
+        extension = os.path.splitext(path)[1][1:]
         format = path.split('/')[4].split('_')[:2]
-        format = "-".join( format )
+        format = "-".join(format)
 
         return {
             'id': video_id,
@@ -60,4 +61,5 @@ class Tube8IE(InfoExtractor):
             'ext': extension,
             'format': format,
             'format_id': format,
+            'age_limit': 18,
         }