From 86ad94bb2ecdbc781f36f0e5fb49c91008e68cc8 Mon Sep 17 00:00:00 2001 From: rzhxeo Date: Sat, 2 Nov 2013 22:33:49 +0100 Subject: [PATCH] [ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction --- youtube_dl/extractor/extremetube.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py index 981de430d..0f1eec40f 100644 --- a/youtube_dl/extractor/extremetube.py +++ b/youtube_dl/extractor/extremetube.py @@ -31,15 +31,13 @@ def _real_extract(self, url): 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:] format = path.split('/')[5].split('_')[:2] format = "-".join( format ) - age_limit = self._rta_search(webpage) - return { 'id': video_id, 'title': video_title, @@ -48,5 +46,5 @@ def _real_extract(self, url): 'ext': extension, 'format': format, 'format_id': format, - 'age_limit': age_limit, + 'age_limit': 18, }