[redtube] Add support for thumbnails

[youtube-dl.git] / youtube_dl / extractor / redtube.py

diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py
index 365aade564bd4f423317d427b3070c91e3e22ad3..ca2e0aae7d2f315254ca899e6fd01a3776753814 100644 (file)
--- a/youtube_dl/extractor/redtube.py
+++ b/youtube_dl/extractor/redtube.py
@@ -4,13 +4,16 @@ 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 = {
         u'url': u'http://www.redtube.com/66418',
         u'file': u'66418.mp4',
-        u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
+        # md5 varies from time to time, as in
+        # https://travis-ci.org/rg3/youtube-dl/jobs/14052463#L295
+        #u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
         u'info_dict': {
-            u"title": u"Sucked on a toilet"
+            u"title": u"Sucked on a toilet",
+            u"age_limit": 18,
         }
     }
 
@@ -27,9 +30,13 @@ class RedTubeIE(InfoExtractor):
             r'<source src="(.+?)" type="video/mp4">', webpage, u'video URL')
 
         video_title = self._html_search_regex(
-            r'<h1 class="videoTitle slidePanelMovable">(.+?)</h1>',
+            r'<h1 class="videoTitle[^"]*">(.+?)</h1>',
             webpage, u'title')
 
+        video_thumbnail = self._html_search_regex(
+            r'playerInnerHTML.+?<img\s+src="(.+?)"',
+            webpage, u'thumbnail', fatal=False)
+
         # No self-labeling, but they describe themselves as
         # "Home of Videos Porno"
         age_limit = 18
@@ -39,5 +46,6 @@ class RedTubeIE(InfoExtractor):
             'url':       video_url,
             'ext':       video_extension,
             'title':     video_title,
+            'thumbnail': video_thumbnail,
             'age_limit': age_limit,
         }