X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fextremetube.py;h=1c20e43644b917d5b73b712d1630740f1a7e7e81;hb=b4a186b7be4d0496b70c61ea58e5376885d3975f;hp=981de430d98f02c18f8909b02bb3dfc7f8936719;hpb=32a35e441874ad9daba10c29a6a33f13a4953fbb;p=youtube-dl.git
diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py
index 981de430d..1c20e4364 100644
--- a/youtube_dl/extractor/extremetube.py
+++ b/youtube_dl/extractor/extremetube.py
@@ -31,14 +31,12 @@ class ExtremeTubeIE(InfoExtractor):
webpage = self._download_webpage(req, video_id)
video_title = self._html_search_regex(r'
]*?title="([^"]+)"[^>]*>\1<', webpage, u'title')
- uploader = self._html_search_regex(r'>Posted by:(?=<)(\s|<[^>]*>)*(.+?)\|', webpage, u'uploader', fatal=False)
+ uploader = self._html_search_regex(r'>Posted by:(?=<)(?:\s|<[^>]*>)*(.+?)\|', webpage, u'uploader', fatal=False)
video_url = compat_urllib_parse.unquote(self._html_search_regex(r'video_url=(.+?)&', webpage, u'video_url'))
- 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('/')[5].split('_')[:2]
- format = "-".join( format )
-
- age_limit = self._rta_search(webpage)
+ format = "-".join(format)
return {
'id': video_id,
@@ -48,5 +46,5 @@ class ExtremeTubeIE(InfoExtractor):
'ext': extension,
'format': format,
'format_id': format,
- 'age_limit': age_limit,
+ 'age_limit': 18,
}