w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction

Browse source
This commit is contained in:
rzhxeo 2013-11-02 22:33:49 +01:00
parent 32a35e4418
commit 86ad94bb2e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/extractor/extremetube.py
View file

@ -31,15 +31,13 @@ class ExtremeTubeIE(InfoExtractor):
webpage = self._download_webpage(req, video_id) webpage = self._download_webpage(req, video_id)
video_title = self._html_search_regex(r'<h1 [^>]*?title="([^"]+)"[^>]*>\1<', webpage, u'title') 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')) 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 path = compat_urllib_parse_urlparse( video_url ).path
extension = os.path.splitext( path )[1][1:] extension = os.path.splitext( path )[1][1:]
format = path.split('/')[5].split('_')[:2] format = path.split('/')[5].split('_')[:2]
format = "-".join( format ) format = "-".join( format )
age_limit = self._rta_search(webpage)
return { return {
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,
@ -48,5 +46,5 @@ class ExtremeTubeIE(InfoExtractor):
'ext': extension, 'ext': extension,
'format': format, 'format': format,
'format_id': format, 'format_id': format,
'age_limit': age_limit, 'age_limit': 18,
} }