youtube-dl

commit f8d0745e27aed161687a1c809de87bc6b59d96ae
parent d719c6a5abf746c31f301ed1a1d8934715eaeb05
Author: Sergey M <dstftw@gmail.com>
Date:   Mon, 20 Jul 2015 00:39:16 +0600

Merge pull request #6291 from atomicdryad/pr-fixvice

fix/support news.vice.com
Diffstat:
M
youtube_dl/extractor/vice.py
 | 
40
+++++++++++++++++++++++++++-------------

1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py
@@ -7,20 +7,34 @@ from ..utils import ExtractorError
 
 
 class ViceIE(InfoExtractor):
-    _VALID_URL = r'http://www\.vice\.com/.*?/(?P<name>.+)'
+    _VALID_URL = r'https?://(.+?\.)?vice\.com/.*?/(?P<name>.+)'
 
-    _TEST = {
-        'url': 'http://www.vice.com/Fringes/cowboy-capitalists-part-1',
-        'info_dict': {
-            'id': '43cW1mYzpia9IlestBjVpd23Yu3afAfp',
-            'ext': 'mp4',
-            'title': 'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',
-        },
-        'params': {
-            # Requires ffmpeg (m3u8 manifest)
-            'skip_download': True,
-        },
-    }
+    _TESTS = [
+        {
+            'url': 'http://www.vice.com/Fringes/cowboy-capitalists-part-1',
+            'info_dict': {
+                'id': '43cW1mYzpia9IlestBjVpd23Yu3afAfp',
+                'ext': 'mp4',
+                'title': 'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',
+            },
+            'params': {
+                # Requires ffmpeg (m3u8 manifest)
+                'skip_download': True,
+            },
+        }, {
+            'url': 'https://news.vice.com/video/experimenting-on-animals-inside-the-monkey-lab',
+            'info_dict': {
+                'id': 'N2bzkydjraWDGwnt8jAttCF6Y0PDv4Zj',
+                'ext': 'mp4',
+                'title': 'VICE News - Inside the Monkey Lab',
+                'description': 'md5:1f660d467d3515f29d11e5ef742a4b82',
+            },
+            'params': {
+                # Requires ffmpeg (m3u8 manifest)
+                'skip_download': True,
+            },
+        }
+    ]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)