Merge remote-tracking branch 'origin/master'

youtube_dl/extractor/vporn.py

@@ -11,22 +11,48 @@ from ..utils import (
 
 class VpornIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?vporn\.com/[^/]+/(?P<display_id>[^/]+)/(?P<id>\d+)'
-    _TEST = {
+    _TESTS = [
-        'url': 'http://www.vporn.com/masturbation/violet-on-her-th-birthday/497944/',
+        {
-        'md5': 'facf37c1b86546fa0208058546842c55',
+            'url': 'http://www.vporn.com/masturbation/violet-on-her-th-birthday/497944/',
-        'info_dict': {
+            'md5': 'facf37c1b86546fa0208058546842c55',
-            'id': '497944',
+            'info_dict': {
-            'display_id': 'violet-on-her-th-birthday',
+                'id': '497944',
-            'ext': 'mp4',
+                'display_id': 'violet-on-her-th-birthday',
-            'title': 'Violet on her 19th birthday',
+                'ext': 'mp4',
-            'description': 'Violet dances in front of the camera which is sure to get you horny.',
+                'title': 'Violet on her 19th birthday',
-            'thumbnail': 're:^https?://.*\.jpg$',
+                'description': 'Violet dances in front of the camera which is sure to get you horny.',
-            'uploader': 'kileyGrope',
+                'thumbnail': 're:^https?://.*\.jpg$',
-            'categories': ['Masturbation', 'Teen'],
+                'uploader': 'kileyGrope',
-            'duration': 393,
+                'categories': ['Masturbation', 'Teen'],
-            'age_limit': 18,
+                'duration': 393,
-        }
+                'age_limit': 18,
-    }
+                'view_count': int,
+                'like_count': int,
+                'dislike_count': int,
+                'comment_count': int,
+            }
+        },
+        {
+            'url': 'http://www.vporn.com/female/hana-shower/523564/',
+            'md5': 'ced35a4656198a1664cf2cda1575a25f',
+            'info_dict': {
+                'id': '523564',
+                'display_id': 'hana-shower',
+                'ext': 'mp4',
+                'title': 'Hana Shower',
+                'description': 'Hana showers at the bathroom.',
+                'thumbnail': 're:^https?://.*\.jpg$',
+                'uploader': 'Hmmmmm',
+                'categories': ['Big Boobs', 'Erotic', 'Teen', 'Female'],
+                'duration': 588,
+                'age_limit': 18,
+                'view_count': int,
+                'like_count': int,
+                'dislike_count': int,
+                'comment_count': int,
+            }
+        },
+    ]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
@@ -64,7 +90,7 @@ class VpornIE(InfoExtractor):
 
         formats = []
 
-        for video in re.findall(r'flashvars\.videoUrl([^=]+?)\s*=\s*"([^"]+)"', webpage):
+        for video in re.findall(r'flashvars\.videoUrl([^=]+?)\s*=\s*"(https?://[^"]+)"', webpage):
             video_url = video[1]
             fmt = {
                 'url': video_url,