aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xyoutube_dl/InfoExtractors.py68
1 files changed, 34 insertions, 34 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 79c4f4b9e..8b2442bac 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -779,39 +779,6 @@ class MetacafeIE(InfoExtractor):
'ext': video_extension.decode('utf-8'),
}]
-class RedtubeIE(InfoExtractor):
- """Information Extractor for redtube"""
- _VALID_URL = r'(?:http://)?(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
- IE_NAME = u'redtube'
-
- def _real_extract(self,url):
- mobj = re.match(self._VALID_URL, url)
- if mobj is None:
- self._downloader.report_error(u'invalid URL: %s' % url)
- return
- video_id = mobj.group('id')
- video_extension = 'mp4'
- webpage = self._download_webpage(url, video_id)
- self.report_extraction(video_id)
- mobj = re.search(r'<source src="'+'(.+)'+'" type="video/mp4">',webpage)
- if mobj is not None:
- video_url = mobj.group(1)
- else:
- self._downloader.report_error(u'unable to extract media URL')
- return
- mobj = re.search('<h1 class="videoTitle slidePanelMovable">'+r'(.+)'+r'</h1>',webpage)
- if mobj is not None:
- video_title = mobj.group(1)
- else:
- video_title = 'Redtube - %s' % time.ctime()
-
- return [{
- 'id': video_id,
- 'url': video_url,
- 'ext': video_extension,
- 'title': video_title,
- }]
-
class DailymotionIE(InfoExtractor):
"""Information Extractor for Dailymotion"""
@@ -4216,6 +4183,39 @@ class BandcampIE(InfoExtractor):
return [track_info]
+class RedtubeIE(InfoExtractor):
+ """Information Extractor for redtube"""
+ _VALID_URL = r'(?:http://)?(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
+ IE_NAME = u'redtube'
+
+ def _real_extract(self,url):
+ mobj = re.match(self._VALID_URL, url)
+ if mobj is None:
+ self._downloader.report_error(u'invalid URL: %s' % url)
+ return
+ video_id = mobj.group('id')
+ video_extension = 'mp4'
+ webpage = self._download_webpage(url, video_id)
+ self.report_extraction(video_id)
+ mobj = re.search(r'<source src="'+'(.+)'+'" type="video/mp4">',webpage)
+ if mobj is not None:
+ video_url = mobj.group(1)
+ else:
+ self._downloader.report_error(u'unable to extract media URL')
+ return
+ mobj = re.search('<h1 class="videoTitle slidePanelMovable">'+r'(.+)'+r'</h1>',webpage)
+ if mobj is not None:
+ video_title = mobj.group(1)
+ else:
+ video_title = 'Redtube - %s' % time.ctime()
+
+ return [{
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': video_extension,
+ 'title': video_title,
+ }]
+
def gen_extractors():
""" Return a list of an instance of every supported extractor.
@@ -4268,11 +4268,11 @@ def gen_extractors():
TEDIE(),
MySpassIE(),
SpiegelIE(),
- RedtubeIE(),
LiveLeakIE(),
ARDIE(),
TumblrIE(),
BandcampIE(),
+ RedtubeIE(),
GenericIE()
]