Merge tag 'upstream/2014.07.11'

[youtubedl] / youtube_dl / extractor / redtube.py

diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py
index 5c4cd20687a5745982bdce0d43417297bca0bc28..4295cf93a75188844bfe0838789e2efcb4363229 100644 (file)
--- a/youtube_dl/extractor/redtube.py
+++ b/youtube_dl/extractor/redtube.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor


@@ -6,14 +8,14 @@ from .common import InfoExtractor
 class RedTubeIE(InfoExtractor):
     _VALID_URL = r'http://(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
     _TEST = {
 class RedTubeIE(InfoExtractor):
     _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',
+        'url': 'http://www.redtube.com/66418',
+        'file': '66418.mp4',

         # md5 varies from time to time, as in
         # https://travis-ci.org/rg3/youtube-dl/jobs/14052463#L295
         # 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"age_limit": 18,
+        #'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
+        'info_dict': {
+            "title": "Sucked on a toilet",
+            "age_limit": 18,

         }
     }
 
         }
     }
 


@@ -33,14 +35,19 @@ class RedTubeIE(InfoExtractor):
             r'<h1 class="videoTitle[^"]*">(.+?)</h1>',
             webpage, u'title')
 
             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
 
         return {
         # No self-labeling, but they describe themselves as
         # "Home of Videos Porno"
         age_limit = 18
 
         return {

-            'id':        video_id,
-            'url':       video_url,
-            'ext':       video_extension,
-            'title':     video_title,
+            'id': video_id,
+            'url': video_url,
+            'ext': video_extension,
+            'title': video_title,
+            'thumbnail': video_thumbnail,

             'age_limit': age_limit,
         }
             'age_limit': age_limit,
         }