summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-11-06 21:39:29 +0700
committerSergey M․ <dstftw@gmail.com>2016-11-06 21:39:29 +0700
commit5021ca6c13e3d011dc24ecf38d326e3a59e726a1 (patch)
tree9d1c5278b62e4886cd0e4345dce06cca4a3cfa6f
parent37e7a71c6c777635c4ed02339339ff27ccb04f58 (diff)
downloadyoutube-dl-5021ca6c13e3d011dc24ecf38d326e3a59e726a1.tar.gz
youtube-dl-5021ca6c13e3d011dc24ecf38d326e3a59e726a1.tar.xz
youtube-dl-5021ca6c13e3d011dc24ecf38d326e3a59e726a1.zip
[redtube] Add support for embed URLs
-rw-r--r--youtube_dl/extractor/redtube.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py
index 721fc3a9e..7d9285ffb 100644
--- a/youtube_dl/extractor/redtube.py
+++ b/youtube_dl/extractor/redtube.py
@@ -10,8 +10,8 @@ from ..utils import (
 
 
 class RedTubeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
+    _TESTS = [{
         'url': 'http://www.redtube.com/66418',
         'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
         'info_dict': {
@@ -23,11 +23,15 @@ class RedTubeIE(InfoExtractor):
             'view_count': int,
             'age_limit': 18,
         }
-    }
+    }, {
+        'url': 'http://embed.redtube.com/?bgcolor=000000&id=1443286',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
+        webpage = self._download_webpage(
+            'http://www.redtube.com/%s' % video_id, video_id)
 
         if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
             raise ExtractorError('Video %s has been removed' % video_id, expected=True)