aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorrzhxeo <rzhxeot7z81b4700@mailcatch.com>2013-11-02 22:33:49 +0100
committerrzhxeo <rzhxeot7z81b4700@mailcatch.com>2013-11-02 22:33:49 +0100
commit86ad94bb2ecdbc781f36f0e5fb49c91008e68cc8 (patch)
treebf1f317f4426959d487e10d759ae0c5f5e388724 /youtube_dl/extractor
parent32a35e441874ad9daba10c29a6a33f13a4953fbb (diff)
[ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/extremetube.py6
1 files 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 @@ class ExtremeTubeIE(InfoExtractor):
webpage = self._download_webpage(req, video_id)
video_title = self._html_search_regex(r'<h1 [^>]*?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=(.+?)&amp;', 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 @@ class ExtremeTubeIE(InfoExtractor):
'ext': extension,
'format': format,
'format_id': format,
- 'age_limit': age_limit,
+ 'age_limit': 18,
}