projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4706 from pkulak/master
[youtube-dl]
/
youtube_dl
/
extractor
/
redtube.py
diff --git
a/youtube_dl/extractor/redtube.py
b/youtube_dl/extractor/redtube.py
index bb19b898a4e76a8fe5e7f694a1399d94d6731d2a..846b76c81528431c0faf8ea3fc9bbd6b017db099 100644
(file)
--- a/
youtube_dl/extractor/redtube.py
+++ b/
youtube_dl/extractor/redtube.py
@@
-1,38
+1,40
@@
-import re
+from __future__ import unicode_literals
from .common import InfoExtractor
class RedTubeIE(InfoExtractor):
from .common import InfoExtractor
class RedTubeIE(InfoExtractor):
- _VALID_URL = r'
(?:http://)?
(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
+ _VALID_URL = r'
http://
(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
_TEST = {
_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"
+ 'url': 'http://www.redtube.com/66418',
+ 'info_dict': {
+ 'id': '66418',
+ 'ext': 'mp4',
+ "title": "Sucked on a toilet",
+ "age_limit": 18,
}
}
def _real_extract(self, url):
}
}
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)
webpage = self._download_webpage(url, video_id)
- self.report_extraction(video_id)
-
video_url = self._html_search_regex(
video_url = self._html_search_regex(
- r'<source src="(.+?)" type="video/mp4">', webpage, u'video URL')
-
+ r'<source src="(.+?)" type="video/mp4">', webpage, 'video URL')
video_title = self._html_search_regex(
video_title = self._html_search_regex(
- r'<h1 class="videoTitle slidePanelMovable">(.+?)</h1>',
- webpage, u'title')
+ r'<h1 class="videoTitle[^"]*">(.+?)</h1>',
+ webpage, 'title')
+ video_thumbnail = self._og_search_thumbnail(webpage)
+
+ # No self-labeling, but they describe themselves as
+ # "Home of Videos Porno"
+ age_limit = 18
return {
return {
- 'id': video_id,
- 'url': video_url,
- 'ext': video_extension,
- 'title': video_title,
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': 'mp4',
+ 'title': video_title,
+ 'thumbnail': video_thumbnail,
+ 'age_limit': age_limit,
}
}