X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/54477c858fa2504360964e675faf953d78ac57e6..11021a3e7a38072a0072edc613930e0a1193196c:/youtube_dl/extractor/redtube.py diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index 994778e..4295cf9 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -1,17 +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', - u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', - u'info_dict': { - u"title": u"Sucked on a toilet", - u"age_limit": 18, + '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 + #'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', + 'info_dict': { + "title": "Sucked on a toilet", + "age_limit": 18, } } @@ -28,17 +32,22 @@ class RedTubeIE(InfoExtractor): r'', webpage, u'video URL') video_title = self._html_search_regex( - r'

(.+?)

', + r'

(.+?)

', webpage, u'title') + video_thumbnail = self._html_search_regex( + r'playerInnerHTML.+?