Update changelog, preparing to upload.

[youtubedl] / youtube_dl / extractor / slutload.py

diff --git a/youtube_dl/extractor/slutload.py b/youtube_dl/extractor/slutload.py
index 7efb29f653b76b25c26d91aac16c6985255ee1d0..6fc2ff60d2a923f763fc834127eb62b667c542d5 100644 (file)
--- a/youtube_dl/extractor/slutload.py
+++ b/youtube_dl/extractor/slutload.py
@@ -7,23 +7,27 @@ from .common import InfoExtractor
 
 class SlutloadIE(InfoExtractor):
     _VALID_URL = r'^https?://(?:\w+\.)?slutload\.com/video/[^/]+/(?P<id>[^/]+)/?$'
 
 class SlutloadIE(InfoExtractor):
     _VALID_URL = r'^https?://(?:\w+\.)?slutload\.com/video/[^/]+/(?P<id>[^/]+)/?$'

-    _TEST = {
+    _TESTS = [{

         'url': 'http://www.slutload.com/video/virginie-baisee-en-cam/TD73btpBqSxc/',
         'url': 'http://www.slutload.com/video/virginie-baisee-en-cam/TD73btpBqSxc/',

-        'md5': '0cf531ae8006b530bd9df947a6a0df77',
+        'md5': '868309628ba00fd488cf516a113fd717',

         'info_dict': {
             'id': 'TD73btpBqSxc',
             'ext': 'mp4',
             'title': 'virginie baisee en cam',
             'age_limit': 18,
         'info_dict': {
             'id': 'TD73btpBqSxc',
             'ext': 'mp4',
             'title': 'virginie baisee en cam',
             'age_limit': 18,

-            'thumbnail': 're:https?://.*?\.jpg'
+            'thumbnail': r're:https?://.*?\.jpg'

         }
         }

-    }
+    }, {
+        # mobile site
+        'url': 'http://mobile.slutload.com/video/masturbation-solo/fviFLmc6kzJ/',
+        'only_matching': True,
+    }]

 
     def _real_extract(self, url):
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)

 
 

-        webpage = self._download_webpage(url, video_id)
+        desktop_url = re.sub(r'^(https?://)mobile\.', r'\1', url)
+        webpage = self._download_webpage(desktop_url, video_id)

 
         video_title = self._html_search_regex(r'<h1><strong>([^<]+)</strong>',
                                               webpage, 'title').strip()
 
         video_title = self._html_search_regex(r'<h1><strong>([^<]+)</strong>',
                                               webpage, 'title').strip()