X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/848723ea972c09f28787db91d8c06e98a274ab89..555f0744b172953b2591db57ff5c6bccb4f378d6:/youtube_dl/extractor/redtube.py diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index 4295cf9..846b76c 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import re - from .common import InfoExtractor @@ -9,35 +7,24 @@ class RedTubeIE(InfoExtractor): _VALID_URL = r'http://(?:www\.)?redtube\.com/(?P[0-9]+)' _TEST = { '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': { + 'id': '66418', + 'ext': 'mp4', "title": "Sucked on a toilet", "age_limit": 18, } } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - - video_id = mobj.group('id') - video_extension = 'mp4' + video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - self.report_extraction(video_id) - video_url = self._html_search_regex( - r'', webpage, u'video URL') - + r'', webpage, 'video URL') video_title = self._html_search_regex( r'

(.+?)

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