X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fredtube.py;h=d1e12dd8d5a6699ba3caa8d041c8bc039e996fc7;hb=cc7fec5818254f4679896823c7de9d17f50201ca;hp=3bbda128e1a3881ffd0b7a81e6c45da128994db5;hpb=3f8ced5144a76a3f9ab7ee8cd06cc79bb75dc564;p=youtube-dl diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index 3bbda128e..d1e12dd8d 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -1,19 +1,21 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor class RedTubeIE(InfoExtractor): - _VALID_URL = r'(?:http://)?(?:www\.)?redtube\.com/(?P[0-9]+)' + _VALID_URL = r'http://(?:www\.)?redtube\.com/(?P[0-9]+)' _TEST = { - u'url': u'http://www.redtube.com/66418', - u'file': u'66418.mp4', + 'url': 'http://www.redtube.com/66418', + 'file': '66418.mp4', # md5 varies from time to time, as in # https://travis-ci.org/rg3/youtube-dl/jobs/14052463#L295 - #u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', - u'info_dict': { - u"title": u"Sucked on a toilet", - u"age_limit": 18, + #'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', + 'info_dict': { + "title": "Sucked on a toilet", + "age_limit": 18, } } @@ -30,17 +32,20 @@ class RedTubeIE(InfoExtractor): r'', webpage, u'video URL') video_title = self._html_search_regex( - r'

(.+?)

', + r'

(.+?)

', webpage, u'title') + video_thumbnail = self._og_search_thumbnail(webpage) + # No self-labeling, but they describe themselves as # "Home of Videos Porno" age_limit = 18 return { - 'id': video_id, - 'url': video_url, - 'ext': video_extension, - 'title': video_title, + 'id': video_id, + 'url': video_url, + 'ext': video_extension, + 'title': video_title, + 'thumbnail': video_thumbnail, 'age_limit': age_limit, }