diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-11-06 21:28:51 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-11-06 21:28:51 +0700 |
| commit | 519d8970496125bca8a7067d841e5c5e5263c26d (patch) | |
| tree | 4831de3c35f971c52c2c4b8a3fd82bce6aa9c427 | |
| parent | b61cd51869d382d19dbd232cc74e010bb2b1ed12 (diff) | |
| download | youtube-dl-519d8970496125bca8a7067d841e5c5e5263c26d.zip youtube-dl-519d8970496125bca8a7067d841e5c5e5263c26d.tar.gz youtube-dl-519d8970496125bca8a7067d841e5c5e5263c26d.tar.bz2 | |
[drtuber] Add support for embed URLs
| -rw-r--r-- | youtube_dl/extractor/drtuber.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dl/extractor/drtuber.py index e8870c4..8baad18 100644 --- a/youtube_dl/extractor/drtuber.py +++ b/youtube_dl/extractor/drtuber.py @@ -10,8 +10,8 @@ from ..utils import ( class DrTuberIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?drtuber\.com/video/(?P<id>\d+)/(?P<display_id>[\w-]+)' - _TEST = { + _VALID_URL = r'https?://(?:www\.)?drtuber\.com/(?:video|embed)/(?P<id>\d+)(?:/(?P<display_id>[\w-]+))?' + _TESTS = [{ 'url': 'http://www.drtuber.com/video/1740434/hot-perky-blonde-naked-golf', 'md5': '93e680cf2536ad0dfb7e74d94a89facd', 'info_dict': { @@ -25,14 +25,18 @@ class DrTuberIE(InfoExtractor): 'thumbnail': 're:https?://.*\.jpg$', 'age_limit': 18, } - } + }, { + 'url': 'http://www.drtuber.com/embed/489939', + 'only_matching': True, + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') - display_id = mobj.group('display_id') + display_id = mobj.group('display_id') or video_id - webpage = self._download_webpage(url, display_id) + webpage = self._download_webpage( + 'http://www.drtuber.com/video/%s' % video_id, display_id) video_url = self._html_search_regex( r'<source src="([^"]+)"', webpage, 'video URL') |